Skip to content

Commit 35f3fb9

Browse files
marschallgregturn
authored andcommitted
SWS-919 Remove unused code
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
1 parent b040abb commit 35f3fb9

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import java.util.regex.Matcher;
2121
import java.util.regex.Pattern;
2222

23-
import org.apache.commons.logging.Log;
24-
import org.apache.commons.logging.LogFactory;
25-
2623
import org.springframework.beans.factory.InitializingBean;
2724
import org.springframework.context.MessageSource;
2825
import org.springframework.context.MessageSourceAware;
@@ -44,9 +41,6 @@
4441
* @version $Id: DaoX509AuthoritiesPopulator.java 2544 2008-01-29 11:50:33Z luke_t $
4542
*/
4643
public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, InitializingBean, MessageSourceAware {
47-
//~ Static fields/initializers =====================================================================================
48-
49-
private static final Log logger = LogFactory.getLog(DaoX509AuthoritiesPopulator.class);
5044

5145
//~ Instance fields ================================================================================================
5246

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.io.IOException;
2020
import java.io.InputStream;
21-
import java.util.Hashtable;
2221
import javax.security.auth.callback.Callback;
2322
import javax.security.auth.callback.CallbackHandler;
2423
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -172,24 +171,6 @@ protected void validateMessage(SoapMessage soapMessage, MessageContext messageCo
172171
}
173172
}
174173

175-
private SOAPMessage verifyInboundMessage(ProcessingContext context)
176-
throws XWSSecurityException {
177-
try {
178-
return processor.verifyInboundMessage(context);
179-
}
180-
catch (XWSSecurityException ex) {
181-
Throwable cause = ex.getCause();
182-
if (cause instanceof NullPointerException) {
183-
StackTraceElement[] stackTrace = cause.getStackTrace();
184-
if (stackTrace.length >= 1 &&
185-
Hashtable.class.getName().equals(stackTrace[0].getClassName())) {
186-
return verifyInboundMessage(context);
187-
}
188-
}
189-
throw ex;
190-
}
191-
}
192-
193174
@Override
194175
protected void cleanUp() {
195176
if (callbackHandler != null) {

0 commit comments

Comments
 (0)