Author: kwright
Date: Mon Jul 22 00:00:44 2013
New Revision: 1505537
URL: http://svn.apache.org/r1505537
Log:
Pull up fix for CONNECTORS-756.
Modified:
manifoldcf/branches/release-1.3-branch/ (props changed)
manifoldcf/branches/release-1.3-branch/CHANGES.txt
manifoldcf/branches/release-1.3-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
Propchange: manifoldcf/branches/release-1.3-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1505535
Modified: manifoldcf/branches/release-1.3-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/CHANGES.txt?rev=1505537&r1=1505536&r2=1505537&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.3-branch/CHANGES.txt Mon Jul 22 00:00:44 2013
@@ -3,6 +3,9 @@ $Id$
======================= Release 1.3 =====================
+CONNECTORS-756: Fix broken JDBC authority UI.
+(Karl Wright)
+
CONNECTORS-755: ant rat-sources finds unlicensed files in alfresco connector
(Karl, Wright, Piergiorgio Lucidi)
Modified:
manifoldcf/branches/release-1.3-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java?rev=1505537&r1=1505536&r2=1505537&view=diff
==============================================================================
---
manifoldcf/branches/release-1.3-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
(original)
+++
manifoldcf/branches/release-1.3-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
Mon Jul 22 00:00:44 2013
@@ -366,7 +366,7 @@ public class JDBCAuthority extends BaseA
if (databasePassword == null) {
databasePassword = "";
} else {
- databasePassword = out.mapPasswordToKey(password);
+ databasePassword = out.mapPasswordToKey(databasePassword);
}
String lIdQuery =
parameters.getParameter(JDBCConstants.databaseUserIdQuery);
if (lIdQuery == null) {
