Author: coheigea
Date: Tue Jul 21 10:26:00 2009
New Revision: 796242
URL: http://svn.apache.org/viewvc?rev=796242&view=rev
Log:
Moved the singletons to be eagerly initialized and removed the synchronized
getInstance() methods as a result.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java?rev=796242&r1=796241&r2=796242&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
Tue Jul 21 10:26:00 2009
@@ -49,7 +49,7 @@
private static Log tlog =
LogFactory.getLog("org.apache.ws.security.TIME");
- private static WSSecurityEngine engine = null;
+ private static WSSecurityEngine engine = new WSSecurityEngine();
/**
* The WSSConfig instance used by this SecurityEngine to
@@ -137,10 +137,7 @@
*
* @return ws-security engine.
*/
- public synchronized static WSSecurityEngine getInstance() {
- if (engine == null) {
- engine = new WSSecurityEngine();
- }
+ public static WSSecurityEngine getInstance() {
return engine;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java?rev=796242&r1=796241&r2=796242&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
Tue Jul 21 10:26:00 2009
@@ -40,17 +40,14 @@
private static Log log =
LogFactory.getLog(EnvelopeIdResolver.class.getName());
- private static EnvelopeIdResolver resolver = null;
+ private static EnvelopeIdResolver resolver = new EnvelopeIdResolver();
/**
* Singleton instance of the resolver.
*
* @return TODO
*/
- public synchronized static ResourceResolverSpi getInstance() {
- if (resolver == null) {
- resolver = new EnvelopeIdResolver();
- }
+ public static ResourceResolverSpi getInstance() {
return resolver;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
