juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r1564006 - /juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java
Date Mon, 03 Feb 2014 19:13:03 GMT
Author: kstam
Date: Mon Feb  3 19:13:02 2014
New Revision: 1564006

URL: http://svn.apache.org/r1564006
Log:
JUDDI-248

Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java?rev=1564006&r1=1564005&r2=1564006&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java
(original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java
Mon Feb  3 19:13:02 2014
@@ -64,7 +64,7 @@ public class UDDIKeyConvention 
 	 */
 	public static String getServiceKey(Properties properties, String serviceName) {
 		Properties tempProperties = new Properties();
-		tempProperties.putAll(properties);
+		if (properties!=null) tempProperties.putAll(properties);
 		tempProperties.put("serviceName", serviceName);
 		//Constructing the serviceKey
 		String keyFormat = tempProperties.getProperty(Property.SERVICE_KEY_FORMAT, DEFAULT_SERVICE_KEY_FORMAT);
@@ -95,7 +95,7 @@ public class UDDIKeyConvention 
 	 */
 	public static String getBindingKey(Properties properties, QName serviceName, String portName,
URI bindingUrl) {
 		Properties tempProperties = new Properties();
-		tempProperties.putAll(properties);
+		if (properties!=null) tempProperties.putAll(properties);
 		tempProperties.put("serviceName", serviceName.getLocalPart());
 		tempProperties.put("portName", portName);
 		int port = bindingUrl.getPort();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message