svn commit: r1415346 [2/2] - in /airavata/trunk/modules: commons/utils/src/main/java/org/apache/airavata/common/utils/ gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/ gfac-core/src/main/java/org/apache/airavata/core/gfac/serv...

[samindaw]

Modified: 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java?rev=1415346&r1=1415345&r2=1415346&view=diff
==============================================================================
--- 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
 (original)
+++ 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
 Thu Nov 29 20:06:16 2012
@@ -195,7 +195,7 @@ public class JCRBrowserPanel extends JPa
 
     private AiravataAPI getJCRRegistry() {
         try {
-            return 
getEngine().getConfiguration().getJcrComponentRegistry().getAiravataAPI();
+            return getEngine().getConfiguration().getAiravataAPI();
         } catch (Exception e) {
             // JCR registry not specified yet
             return null;

Modified: 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1415346&r1=1415345&r2=1415346&view=diff
==============================================================================
--- 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
 (original)
+++ 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
 Thu Nov 29 20:06:16 2012
@@ -149,10 +149,10 @@ public class XBayaUtil {
 
     public static boolean acquireJCRRegistry(XBayaEngine engine) {
         XBayaConfiguration configuration = engine.getConfiguration();
-        if (configuration.getJcrComponentRegistry() == null) {
+        if (configuration.getAiravataAPI() == null) {
                updateJCRRegistryInfo(engine);
         }
-        return engine.getConfiguration().getJcrComponentRegistry() != null;
+        return engine.getConfiguration().getAiravataAPI() != null;
     }
     
     public static void updateJCRRegistryInfo(XBayaEngine xbayaEngine) {