Check "username and name and namespace" for update or insert

src/java/org/jivesoftware/openfire/PrivateStorage.java

@@ -53,7 +53,7 @@ public class PrivateStorage extends BasicModule implements UserEventListener {
 	private static final Logger Log = LoggerFactory.getLogger(PrivateStorage.class);
 
     private static final String LOAD_PRIVATE =
-        "SELECT privateData FROM ofPrivate WHERE name=? AND namespace=?";
+        "SELECT privateData FROM ofPrivate WHERE username=? AND name=? AND namespace=?";
     private static final String INSERT_PRIVATE =
         "INSERT INTO ofPrivate (privateData, name, username, namespace) VALUES (?,?,?,?)";
     private static final String UPDATE_PRIVATE =
@@ -118,8 +118,9 @@ public class PrivateStorage extends BasicModule implements UserEventListener {
                 data.write(writer);
                 con = DbConnectionManager.getConnection();
                 pstmt = con.prepareStatement(LOAD_PRIVATE);
-                pstmt.setString(1, data.getName());
-                pstmt.setString(2, data.getNamespaceURI());
+                pstmt.setString(1, username);
+                pstmt.setString(2, data.getName());
+                pstmt.setString(3, data.getNamespaceURI());
                 rs = pstmt.executeQuery();
                 boolean update = false;
                 if (rs.next()) {