Author: dkulp
Date: Mon Mar 7 20:26:43 2011
New Revision: 1078922
URL: http://svn.apache.org/viewvc?rev=1078922&view=rev
Log:
Remove some dead code and fix other eclipse warnings
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/Loader.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java?rev=1078922&r1=1078921&r2=1078922&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
(original)
+++
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
Mon Mar 7 20:26:43 2011
@@ -844,11 +844,7 @@ public class Merlin extends CryptoBase {
Object certName =
createBCX509Name(x509cert.getIssuerX500Principal().getName());
if (certName.equals(issuerRDN)) {
- if (certs == null) {
- return new Certificate[]{cert};
- } else {
- return certs;
- }
+ return certs;
}
}
}
@@ -943,11 +939,7 @@ public class Merlin extends CryptoBase {
byte[] data = sha.digest();
if (Arrays.equals(data, thumbprint)) {
- if (certs == null) {
- return new Certificate[]{x509cert};
- } else {
- return certs;
- }
+ return certs;
}
}
}
@@ -1017,11 +1009,7 @@ public class Merlin extends CryptoBase {
X509Certificate x509cert = (X509Certificate) cert;
byte[] data = getSKIBytesFromCert(x509cert);
if (data.length == skiBytes.length && Arrays.equals(data,
skiBytes)) {
- if (certs == null) {
- return new Certificate[]{x509cert};
- } else {
- return certs;
- }
+ return certs;
}
}
}
@@ -1186,11 +1174,7 @@ public class Merlin extends CryptoBase {
Object certName = createBCX509Name(foundRDN.getName());
if (subjectRDN.equals(certName)) {
- if (certs == null) {
- return new Certificate[]{cert};
- } else {
- return certs;
- }
+ return certs;
}
}
}
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java?rev=1078922&r1=1078921&r2=1078922&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
(original)
+++
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
Mon Mar 7 20:26:43 2011
@@ -152,13 +152,6 @@ public class EncryptedKeySTRParser imple
QName el = new QName(bstElement.getNamespaceURI(),
bstElement.getLocalName());
if (el.equals(WSSecurityEngine.BINARY_TOKEN)) {
X509Security token = new X509Security(bstElement);
- if (token == null) {
- throw new WSSecurityException(
- WSSecurityException.UNSUPPORTED_SECURITY_TOKEN,
- "unsupportedBinaryTokenType",
- new Object[] {"for decryption (BST)"}
- );
- }
if (bspCompliant) {
checkBinarySecurityBSPCompliance(secRef, token);
}
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/Loader.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/Loader.java?rev=1078922&r1=1078921&r2=1078922&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/Loader.java
(original)
+++
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/Loader.java
Mon Mar 7 20:26:43 2011
@@ -119,8 +119,8 @@ public class Loader {
* @throws InvocationTargetException
*/
public static ClassLoader getTCL() throws IllegalAccessException,
InvocationTargetException {
- return (ClassLoader)AccessController.doPrivileged(new
PrivilegedAction() {
- public Object run() {
+ return AccessController.doPrivileged(new
PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -133,8 +133,8 @@ public class Loader {
* @return the class loader of the argument
*/
public static ClassLoader getClassLoader(final Class clazz) {
- return (ClassLoader)AccessController.doPrivileged(new
PrivilegedAction() {
- public Object run() {
+ return AccessController.doPrivileged(new
PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
return clazz.getClassLoader();
}
});
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1078922&r1=1078921&r2=1078922&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
Mon Mar 7 20:26:43 2011
@@ -55,8 +55,6 @@ public class SamlTokenHOKTest extends or
private static final Log LOG = LogFactory.getLog(SamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = CryptoFactory.getInstance("crypto.properties");
- private CallbackHandler keystoreCallbackHandler = new
KeystoreCallbackHandler();
- private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
/**
* Test that creates, sends and processes a signed SAML 1.1 authentication
assertion.
