update

shinfan · shinfan · commit 2ff68510a032 · 2016-12-01T13:56:39.000-08:00
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -682,20 +682,7 @@ static <T> T getFromServiceLoader(Class<? extends T> clazz, T defaultInstance) {
   private static String defaultLibraryVersion() {
     String version = getPomVersion();
     if (version == null) {
-      try {
-        Enumeration<URL> resources =
-            ServiceOptions.class.getClassLoader().getResources(JarFile.MANIFEST_NAME);
-        while (resources.hasMoreElements() && version == null) {
-          Manifest manifest = new Manifest(resources.nextElement().openStream());
-          Attributes manifestAttributes = manifest.getMainAttributes();
-          String artifactId = manifestAttributes.getValue(MANIFEST_ARTIFACT_ID_KEY);
-          if (artifactId != null && artifactId.equals(ARTIFACT_ID)) {
-            version = manifestAttributes.getValue(MANIFEST_VERSION_KEY);
-          }
-        }
-      } catch (IOException e) {
-        // ignore
-      }
+      version = getManifestVersion();
     }
     return version;
   }
@@ -716,4 +703,23 @@ private static String getPomVersion() {
     }
     return null;
   }
+
+  private static String getManifestVersion() {
+    String version = null;
+    try {
+      Enumeration<URL> resources =
+          ServiceOptions.class.getClassLoader().getResources(JarFile.MANIFEST_NAME);
+      while (resources.hasMoreElements() && version == null) {
+        Manifest manifest = new Manifest(resources.nextElement().openStream());
+        Attributes manifestAttributes = manifest.getMainAttributes();
+        String artifactId = manifestAttributes.getValue(MANIFEST_ARTIFACT_ID_KEY);
+        if (artifactId != null && artifactId.equals(ARTIFACT_ID)) {
+          version = manifestAttributes.getValue(MANIFEST_VERSION_KEY);
+        }
+      }
+    } catch (IOException e) {
+      // ignore
+    }
+    return version;
+  }
 }
