airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1514029 - /airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
Date Wed, 14 Aug 2013 20:28:04 GMT
Author: lahiru
Date: Wed Aug 14 20:28:04 2013
New Revision: 1514029

URL: http://svn.apache.org/r1514029
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-846.

Modified:
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java?rev=1514029&r1=1514028&r2=1514029&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
(original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
Wed Aug 14 20:28:04 2013
@@ -42,8 +42,14 @@ public class RegistrySettings {
 		if (url == null) {
     		if (AiravataUtils.isServer()){
     			 url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+                if(url == null){
+                    url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
+                }
     		}else if (AiravataUtils.isClient()){
         		url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
+                if(url == null){
+                    url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+                }
         	}else{
         		//unknown execution mode... If so, first assume its client, if not server...
         		url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);



Mime
View raw message