---

aozarov · aozarov · commit dac64ca2667f · 2015-11-13T12:51:24.000-08:00
yaml --- r: 6515 b: refs/heads/tswast-patch-1 c: 522ed56 h: refs/heads/master i: 6513: f188d6e 6511: 66c2e50
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 22f52aee1eb371759e3b990e5bd70c5c12443621
+refs/heads/tswast-patch-1: 522ed566e56023df01f5dfbac66913f88effdd64
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -450,9 +450,11 @@ protected static String getAppEngineProjectId() {
     try {
       Class<?> factoryClass =
           Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
+      Class<?> serviceClass =
+          Class.forName("com.google.appengine.api.appidentity.AppIdentityService");
       Method method = factoryClass.getMethod("getAppIdentityService");
       Object appIdentityService = method.invoke(null);
-      method = appIdentityService.getClass().getMethod("getServiceAccountName");
+      method = serviceClass.getMethod("getServiceAccountName");
       String serviceAccountName = (String) method.invoke(appIdentityService);
       int indexOfAtSign = serviceAccountName.indexOf('@');
       return serviceAccountName.substring(0, indexOfAtSign);
