Author: dkulp Date: Wed May 9 16:14:12 2012 New Revision: 1336270 URL: http://svn.apache.org/viewvc?rev=1336270&view=rev Log: Merged revisions 1336259 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1336259 | dkulp | 2012-05-09 12:07:11 -0400 (Wed, 09 May 2012) | 9 lines Merged revisions 1332849 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1332849 | dkulp | 2012-05-01 17:45:41 -0400 (Tue, 01 May 2012) | 2 lines Fix java 5 compile failure ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1336270&r1=1336269&r2=1336270&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java Wed May 9 16:14:12 2012 @@ -118,7 +118,6 @@ public final class WSSecurityPolicyLoade cm.registerListener(new ClientLifeCycleListener() { public void clientCreated(Client client) { } - @Override public void clientDestroyed(Client client) { shutdownResources(client.getEndpoint().getEndpointInfo()); }
