svn commit: r1600738 - /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java

[ju...@apache.org]

Author: juanpablo
Date: Thu Jun  5 19:30:22 2014
New Revision: 1600738

URL: http://svn.apache.org/r1600738
Log:
Fixes JSPWIKI-311 - Cannot save user profile in container managed authentication mode

Modified:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java?rev=1600738&r1=1600737&r2=1600738&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java Thu Jun  5 19:30:22 2014
@@ -18,17 +18,27 @@
  */
 package org.apache.wiki.auth.user;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 import java.security.Principal;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
 import org.apache.wiki.auth.NoSuchPrincipalException;
@@ -700,7 +710,7 @@ public class JDBCUserDatabase extends Ab
         }
 
         // If password changed, hash it before we save
-        if( !password.equals( existingPassword ) )
+        if( !StringUtils.equals( password, existingPassword ) )
         {
             password = getHash( password );
         }