svn commit: r1674725 - in /openmeetings: branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java

[solomax]

Author: solomax
Date: Mon Apr 20 03:22:20 2015
New Revision: 1674725

URL: http://svn.apache.org/r1674725
Log:
[OPENMEETINGS-1198] empty string is used in case password was not specified

Modified:
    
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
    
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java

Modified: 
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1674725&r1=1674724&r2=1674725&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
 Mon Apr 20 03:22:20 2015
@@ -130,7 +130,7 @@ public abstract class ConnectionProperti
        protected void patchAttribute(String[] tokens) {
                for (int i = 0; i < tokens.length; ++i) {
                        patchProp(tokens, i, USER_PREFIX, props.getLogin());
-                       patchProp(tokens, i, PASS_PREFIX, props.getPassword());
+                       patchProp(tokens, i, PASS_PREFIX, props.getPassword() 
== null ? "" : props.getPassword());
                        patchProp(tokens, i, URL_PREFIX, props.getURL());
                }
        }

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1674725&r1=1674724&r2=1674725&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
 Mon Apr 20 03:22:20 2015
@@ -131,7 +131,7 @@ public abstract class ConnectionProperti
        protected void patchAttribute(String[] tokens) {
                for (int i = 0; i < tokens.length; ++i) {
                        patchProp(tokens, i, USER_PREFIX, props.getLogin());
-                       patchProp(tokens, i, PASS_PREFIX, props.getPassword());
+                       patchProp(tokens, i, PASS_PREFIX, props.getPassword() 
== null ? "" : props.getPassword());
                        patchProp(tokens, i, URL_PREFIX, props.getURL());
                }
        }