Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-919 Remove unused code

Browse Source 
The project contains some code that can never be executed and can be
removed safely.

This change removes:

 * XwsSecurityInterceptor#verifyInboundMessage
 * DaoX509AuthoritiesPopulator#logger

Issue: SWS-919
https://jira.spring.io/browse/SWS-919
This commit is contained in:
Philippe Marschall
2015-10-03 12:46:35 +02:00
committed by Greg Turnquist
parent b040abb66d
commit 35f3fb9102
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
View File

@@ -20,9 +20,6 @@ import java.security.cert.X509Certificate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware;
@@ -44,9 +41,6 @@ import org.springframework.ws.soap.security.x509.X509AuthoritiesPopulator;
* @version $Id: DaoX509AuthoritiesPopulator.java 2544 2008-01-29 11:50:33Z luke_t $
*/
public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, InitializingBean, MessageSourceAware {
//~ Static fields/initializers =====================================================================================
private static final Log logger = LogFactory.getLog(DaoX509AuthoritiesPopulator.class);
//~ Instance fields ================================================================================================

19
spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
View File

@@ -18,7 +18,6 @@ package org.springframework.ws.soap.security.xwss;
import java.io.IOException;
import java.io.InputStream;
import java.util.Hashtable;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -172,24 +171,6 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem
}
}
private SOAPMessage verifyInboundMessage(ProcessingContext context)
throws XWSSecurityException {
try {
return processor.verifyInboundMessage(context);
}
catch (XWSSecurityException ex) {
Throwable cause = ex.getCause();
if (cause instanceof NullPointerException) {
StackTraceElement[] stackTrace = cause.getStackTrace();
if (stackTrace.length >= 1 &&
Hashtable.class.getName().equals(stackTrace[0].getClassName())) {
return verifyInboundMessage(context);
}
}
throw ex;
}
}
@Override
protected void cleanUp() {
if (callbackHandler != null) {