Revision: 27036
Author: bvdschans
Date: 2011-02-22 12:25:51 +0100 (Tue, 22 Feb 2011)
Log Message:
-----------
CMS7-4987: Fix java 6 compatibility with ldaps
Modified Paths:
--------------
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/GullibleSSLSocketFactory.java
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/LdapSecurityProvider.java
Modified:
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/GullibleSSLSocketFactory.java
===================================================================
---
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/GullibleSSLSocketFactory.java
2011-02-22 09:41:50 UTC (rev 27035)
+++
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/GullibleSSLSocketFactory.java
2011-02-22 11:25:51 UTC (rev 27036)
@@ -114,4 +114,9 @@
final int localPort) throws IOException {
return factory.createSocket(address, port, localAddress, localPort);
}
+
+ // don not use the Override annotation as the method is only available in
Java 6
+ public Socket createSocket() throws IOException {
+ return factory.createSocket();
+ }
}
Modified:
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/LdapSecurityProvider.java
===================================================================
---
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/LdapSecurityProvider.java
2011-02-22 09:41:50 UTC (rev 27035)
+++
hippo-cms7/archive/branches/Branch-HREPTWO-v2_16_xx/addon/ldap/repository/src/main/java/org/hippoecm/repository/security/ldap/LdapSecurityProvider.java
2011-02-22 11:25:51 UTC (rev 27036)
@@ -83,7 +83,9 @@
public void init(SecurityProviderContext context) throws
RepositoryException {
log.info("Initializing security provider: '{}'.",
context.getProviderId());
this.context = context;
-
+ final String pId = context.getProviderId();
+
+
/* Register a listener for the provider node. Whenever a node
* or property is added, refresh the security provider.
*/
@@ -93,9 +95,9 @@
try {
reloadConfig();
} catch (InvalidItemStateException e) {
- log.debug("Invalid state while reloading config, provider
probably removed: " + e.getMessage());
+ log.debug("Invalid state while reloading config, provider
{} probably removed: {}", pId, e.getMessage());
} catch (RepositoryException e) {
- log.warn("Failed to reload config for provider: {}",
e.getMessage());
+ log.error("Failed to reload config for provider: " + pId,
e);
}
}
};
_______________________________________________
Hippocms-svn mailing list
[email protected]
http://lists.hippo.nl/mailman/listinfo/hippocms-svn
