Author: indika
Date: Mon Feb 16 08:48:32 2009
New Revision: 744864
URL: http://svn.apache.org/viewvc?rev=744864&view=rev
Log:
fix some bugs identified by findbug tool
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
synapse/trunk/java/modules/samples/src/main/java/samples/mediators/BinaryExtractMediator.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
Mon Feb 16 08:48:32 2009
@@ -304,15 +304,15 @@
public static final String TEMP_FILE_SUFIX = "synapse.tempfile.sufix";
public static final String DOING_FAIL_OVER = "synapse.doing.failover";
-
- public static String SYNAPSE_STARTUP_TASK_SCHEDULER =
"synapse.startup.taskscheduler";
-
- public static String SYNAPSE_STARTUP_TASK_DESCRIPTIONS_REPOSITORY =
"synapse.startup.taskdescriptions.repository";
+
+ public static final String SYNAPSE_STARTUP_TASK_SCHEDULER =
"synapse.startup.taskscheduler";
+
+ public static final String SYNAPSE_STARTUP_TASK_DESCRIPTIONS_REPOSITORY =
"synapse.startup.taskdescriptions.repository";
// host and ip synapse is running
- public static String SERVER_HOST = "SERVER_HOST";
+ public static final String SERVER_HOST = "SERVER_HOST";
- public static String SERVER_IP = "SERVER_IP";
+ public static final String SERVER_IP = "SERVER_IP";
// Known transport error codes
public static final int RCV_IO_ERROR_SENDING = 101000;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Mon Feb 16 08:48:32 2009
@@ -277,18 +277,13 @@
if (log.isDebugEnabled()) {
log.info("Content at URL : " + url + " is non XML..");
}
-
- Object content = readNonXML(url);
- if (content instanceof OMNode) {
- return (OMNode) content;
- }
+ return readNonXML(url);
} finally {
try {
inStream.close();
} catch (IOException ignore) {
}
}
- return null;
}
public static InputSource getInputSourceFormURI(URI uri) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
Mon Feb 16 08:48:32 2009
@@ -115,7 +115,7 @@
if (attName != null && attValue != null) {
String name = attName.getAttributeValue().trim();
String value = attValue.getAttributeValue().trim();
- if (result.containsKey(attName)) {
+ if (result.containsKey(name)) {
handleException("Duplicate " +
childElementName.getLocalPart()
+ " with name " + name);
} else {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
Mon Feb 16 08:48:32 2009
@@ -52,18 +52,21 @@
};
- private static ConfigurationFactoryAndSerializerFinder instance = null;
+ private final static ConfigurationFactoryAndSerializerFinder instance =
+ new ConfigurationFactoryAndSerializerFinder();
/**
* A map of mediator QNames to implementation class
*/
- private static Map factoryMap = new HashMap();
+ private final static Map<QName,Class> factoryMap = new
HashMap<QName,Class>();
- private static Map serializerMap = new HashMap();
+ private final static Map<QName,Class> serializerMap = new
HashMap<QName,Class>();
+
+ private static boolean initialized = false;
public static synchronized ConfigurationFactoryAndSerializerFinder
getInstance() {
- if (instance == null) {
- instance = new ConfigurationFactoryAndSerializerFinder();
+ if (!initialized) {
+ loadConfigurationFatoriesAndSerializers();
}
return instance;
}
@@ -71,32 +74,13 @@
/**
* Force re initialization next time
*/
- public synchronized void reset() {
+ public static synchronized void reset() {
factoryMap.clear();
- instance = null;
+ serializerMap.clear();
+ initialized = false;
}
private ConfigurationFactoryAndSerializerFinder() {
-
- factoryMap = new HashMap();
-
- for (int i = 0; i < configurationFactories.length; i++) {
- Class c = configurationFactories[i];
- try {
- ConfigurationFactory fac = (ConfigurationFactory)
c.newInstance();
- factoryMap.put(fac.getTagQName(), c);
- serializerMap.put(fac.getTagQName(), fac.getSerializerClass());
- } catch (Exception e) {
- throw new SynapseException("Error instantiating " +
c.getName(), e);
- }
- }
- // now iterate through the available pluggable mediator factories
- registerExtensions();
- }
-
- private void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseException(msg, e);
}
private void handleException(String msg) {
@@ -104,13 +88,29 @@
throw new SynapseException(msg);
}
+ private static void loadConfigurationFatoriesAndSerializers() {
+ for (Class c : configurationFactories) {
+ if (c != null) {
+ try {
+ ConfigurationFactory fac = (ConfigurationFactory)
c.newInstance();
+ factoryMap.put(fac.getTagQName(), c);
+ serializerMap.put(fac.getTagQName(),
fac.getSerializerClass());
+ } catch (Exception e) {
+ throw new SynapseException("Error instantiating " +
c.getName(), e);
+ }
+ }
+ }
+ // now iterate through the available pluggable mediator factories
+ registerExtensions();
+ initialized = true;
+ }
/**
* Register pluggable mediator factories from the classpath
* <p/>
* This looks for JAR files containing a META-INF/services that adheres to
the following
* http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service%20Provider
*/
- private void registerExtensions() {
+ private static void registerExtensions() {
// register MediatorFactory extensions
Iterator it = Service.providers(ConfigurationFactory.class);
@@ -136,7 +136,7 @@
public SynapseConfiguration getConfiguration(OMElement element) {
String localName = element.getLocalName();
- QName qName = null;
+ QName qName;
if (element.getNamespace() != null) {
qName = new QName(element.getNamespace().getNamespaceURI(),
localName);
} else {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
Mon Feb 16 08:48:32 2009
@@ -75,16 +75,18 @@
EventPublisherMediatorFactory.class
};
- private static MediatorFactoryFinder instance = null;
+ private final static MediatorFactoryFinder instance = new
MediatorFactoryFinder();
/**
* A map of mediator QNames to implementation class
*/
private static Map<QName, Class> factoryMap = new HashMap<QName, Class>();
+ private static boolean initialized = false;
+
public static synchronized MediatorFactoryFinder getInstance() {
- if (instance == null) {
- instance = new MediatorFactoryFinder();
+ if (!initialized) {
+ loadMediatorFactories();
}
return instance;
}
@@ -92,15 +94,15 @@
/**
* Force re initialization next time
*/
- public synchronized void reset() {
+ public static synchronized void reset() {
factoryMap.clear();
- instance = null;
+ initialized = false;
}
private MediatorFactoryFinder() {
+ }
- factoryMap = new HashMap<QName, Class>();
-
+ private static void loadMediatorFactories() {
for (Class c : mediatorFactories) {
try {
MediatorFactory fac = (MediatorFactory) c.newInstance();
@@ -111,6 +113,7 @@
}
// now iterate through the available pluggable mediator factories
registerExtensions();
+ initialized = true;
}
/**
@@ -119,7 +122,7 @@
* This looks for JAR files containing a META-INF/services that adheres to
the following
* http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service%20Provider
*/
- private void registerExtensions() {
+ private static void registerExtensions() {
// register MediatorFactory extensions
Iterator it = Service.providers(MediatorFactory.class);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
Mon Feb 16 08:48:32 2009
@@ -39,7 +39,7 @@
private static final Log log = LogFactory
.getLog(ConfigurationFactoryAndSerializerFinder.class);
- private static StartupFinder instance = null;
+ private final static StartupFinder instance = new StartupFinder();
/**
* A map of mediator QNames to implementation class
@@ -50,9 +50,11 @@
private static Map<QName,Class<? extends StartupSerializer>> serializerMap
= new HashMap<QName,Class<? extends
StartupSerializer>>();
+ private static boolean initialized = false;
+
public static synchronized StartupFinder getInstance() {
- if (instance == null) {
- instance = new StartupFinder();
+ if (!initialized) {
+ loadStartups();
}
return instance;
}
@@ -60,32 +62,36 @@
/**
* Force re initialization next time
*/
- public synchronized void reset() {
+ public static synchronized void reset() {
factoryMap.clear();
- instance = null;
+ serializerMap.clear();
+ initialized = false;
}
private static final Class<?>[] builtins = {SimpleQuartzFactory.class};
private StartupFinder() {
- // preregister any built in
- for (int i = 0; i < builtins.length; i++) {
- Class<? extends StartupFactory> b =
builtins[i].asSubclass(StartupFactory.class);
- StartupFactory sf;
- try {
- sf = b.newInstance();
- } catch (Exception e) {
- throw new SynapseException("cannot instantiate " +
b.getName(), e);
+ }
+ private static void loadStartups() {
+ // preregister any built in
+ for (Class<?> builtin : builtins) {
+ if (builtin != null) {
+ Class<? extends StartupFactory> b =
builtin.asSubclass(StartupFactory.class);
+ StartupFactory sf;
+ try {
+ sf = b.newInstance();
+ } catch (Exception e) {
+ throw new SynapseException("cannot instantiate " +
b.getName(), e);
+
+ }
+ factoryMap.put(sf.getTagQName(), b);
+ serializerMap.put(sf.getTagQName(), sf.getSerializerClass());
}
- factoryMap.put(sf.getTagQName(), b);
- serializerMap.put(sf.getTagQName(), sf.getSerializerClass());
-
}
-
registerExtensions();
+ initialized = true;
}
-
private void handleException(String msg) {
log.error(msg);
throw new SynapseException(msg);
@@ -98,7 +104,7 @@
* the following
* http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service%20Provider
*/
- private void registerExtensions() {
+ private static void registerExtensions() {
// log.debug("Registering mediator extensions found in the classpath :
"
// + System.getResource("java.class.path"));
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java
Mon Feb 16 08:48:32 2009
@@ -43,12 +43,12 @@
private String SESSION_IDS = "synapse.salep.sessionids.";
- private static ConfigurationContext configCtx;
+ private ConfigurationContext configCtx;
/* Is this env. support clustering*/
- private static boolean isClustered = false;
+ private boolean isClustered = false;
- private static boolean initialized = false;
+ private boolean initialized = false;
/*Cache all path with its endpoint sequence. This is only need for a
clustered environment */
private final Map<List<String>, List<Endpoint>> namesToEndpointsMap =
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Mon Feb 16 08:48:32 2009
@@ -127,17 +127,17 @@
*/
public Object evaluate(Object scopeObject, Object keyObject, Object
dateformat,Navigator navigator) {
- boolean traceOn = synCtx.getTracingState() ==
SynapseConstants.TRACING_ON;
- boolean traceOrDebugOn = traceOn || log.isDebugEnabled();
-
if (synCtx == null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Synapse message context has not been
set for the " +
- "XPath extension function
'synapse:get-property(prop-name)'");
+ if (log.isDebugEnabled()) {
+ log.debug("Synapse message context has not been set for the " +
+ "XPath extension function
'synapse:get-property(prop-name)'");
}
return null;
}
+ boolean traceOn = synCtx.getTracingState() ==
SynapseConstants.TRACING_ON;
+ boolean traceOrDebugOn = traceOn || log.isDebugEnabled();
+
String scope = StringFunction.evaluate(scopeObject, navigator);
String key = StringFunction.evaluate(keyObject, navigator);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
Mon Feb 16 08:48:32 2009
@@ -62,8 +62,8 @@
private String targetKey = null;
private String clientRepository = null;
private String axis2xml = null;
- public static String DEFAULT_CLIENT_REPO =
"./samples/axis2Client/client_repo";
- public static String DEFAULT_AXIS2_XML =
"./samples/axis2Client/client_repo/conf/axis2.xml";
+ public final static String DEFAULT_CLIENT_REPO =
"./samples/axis2Client/client_repo";
+ public final static String DEFAULT_AXIS2_XML =
"./samples/axis2Client/client_repo/conf/axis2.xml";
public boolean mediate(MessageContext synCtx) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/tool/CipherTool.java
Mon Feb 16 08:48:32 2009
@@ -55,44 +55,44 @@
private static Log log = LogFactory.getLog(CipherTool.class);
/* The argument name for KeyStore location */
- public static String KEY_STORE = "keystore";
+ public final static String KEY_STORE = "keystore";
/* The KeyStore type*/
- public static String STORE_TYPE = "storetype";
+ public final static String STORE_TYPE = "storetype";
/* The argument name for password to access KeyStore*/
- public static String STORE_PASS = "storepass";
+ public final static String STORE_PASS = "storepass";
/* The argument name for password for access private key */
- public static String KEY_PASS = "keypass";
+ public final static String KEY_PASS = "keypass";
/* The alias to identify key owner */
- public static String ALIAS = "alias";
+ public final static String ALIAS = "alias";
/* If the key is from a file , then it's location*/
- public static String KEY_FILE = "keyfile";
+ public final static String KEY_FILE = "keyfile";
/* The algorithm for encrypting or decrypting */
- public static String ALGORITHM = "algorithm";
+ public final static String ALGORITHM = "algorithm";
/* The operation mode of cihper - encrypt or decrypt */
- public static String OP_MODE = "opmode";
+ public final static String OP_MODE = "opmode";
/* The cipher type - asymmetric , symmetric */
- public static String CIPHER_TYPE = "ciphertype";
+ public final static String CIPHER_TYPE = "ciphertype";
/* The cipher or plain text as an in-lined */
- public static String SOURCE_IN_LINED = "source";
+ public final static String SOURCE_IN_LINED = "source";
/* The the source from a file*/
- public static String SOURCE_FILE = "sourcefile";
+ public final static String SOURCE_FILE = "sourcefile";
/* If the target has to be written to a file*/
- public static String TARGET_FILE = "targetfile";
+ public final static String TARGET_FILE = "targetfile";
/* If the output of cipher operation need to be encode - only base64*/
- public static String OUT_TYPE = "outtype";
+ public final static String OUT_TYPE = "outtype";
/* If the encode of the input type base64*/
- public static String IN_TYPE = "intype";
+ public final static String IN_TYPE = "intype";
/* Is this keyStore a trusted one */
- public static String TRUSTED = "trusted";
+ public final static String TRUSTED = "trusted";
/* Operation mode */
- public static String ENCRYPT = "encrypt";
- public static String DECRYPT = "decrypt";
+ public final static String ENCRYPT = "encrypt";
+ public final static String DECRYPT = "decrypt";
- public static String BASE64 = "base64";
+ public final static String BASE64 = "base64";
public static void main(String args[]) throws Exception {
@@ -106,8 +106,6 @@
// Loads the cipher relate information
CipherInformation cipherInformation = getCipherInformation(cmd);
//Key information must not contain any password
- //Password for access KeyStore
- String storePass = getArgument(cmd, STORE_PASS);
//Password for access private key
String keyPass = getArgument(cmd, KEY_PASS);
// If Key need to be loaded from a file
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
Mon Feb 16 08:48:32 2009
@@ -69,10 +69,10 @@
*/
private SynapseEnvironment synapseEnvironment;
- public static String SOAP11_FORMAT = "soap11";
- public static String SOAP12_FORMAT = "soap12";
- public static String POX_FORMAT = "pox";
- public static String GET_FORMAT = "get";
+ public final static String SOAP11_FORMAT = "soap11";
+ public final static String SOAP12_FORMAT = "soap12";
+ public final static String POX_FORMAT = "pox";
+ public final static String GET_FORMAT = "get";
/**
* Initializes the Injector
Modified:
synapse/trunk/java/modules/samples/src/main/java/samples/mediators/BinaryExtractMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/mediators/BinaryExtractMediator.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/samples/src/main/java/samples/mediators/BinaryExtractMediator.java
(original)
+++
synapse/trunk/java/modules/samples/src/main/java/samples/mediators/BinaryExtractMediator.java
Mon Feb 16 08:48:32 2009
@@ -82,7 +82,7 @@
}
public void setTraceState(int traceState) {
- traceState = traceState;
+ this.traceState = traceState;
}
public int getTraceState() {
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
Mon Feb 16 08:48:32 2009
@@ -33,8 +33,11 @@
* Default TriggerFactory ship with synapse utils
*/
public class DefaultTaskTriggerFactory implements TaskTriggerFactory {
+
private static final Log log =
LogFactory.getLog(DefaultTaskTriggerFactory.class);
+ private final static Random RANDOM = new Random();
+
/**
* @see TaskTriggerFactory
*/
@@ -80,7 +83,7 @@
trigger.setEndTime(endTime);
}
// give the trigger a random name
- trigger.setName(name + "-trigger-" + String.valueOf((new
Random()).nextLong()));
+ trigger.setName(name + "-trigger-" +
String.valueOf(RANDOM.nextLong()));
String group = taskDescription.getGroup();
if (group != null && !"".equals(group)) {
trigger.setGroup(group);
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
Mon Feb 16 08:48:32 2009
@@ -52,7 +52,7 @@
/**
* Property look up key for get a quartz configuration
*/
- public static String QUARTZ_CONF = "quartz.conf";
+ public final static String QUARTZ_CONF = "quartz.conf";
/**
* Name of the scheduler
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java?rev=744864&r1=744863&r2=744864&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java
Mon Feb 16 08:48:32 2009
@@ -29,7 +29,7 @@
public class LoggingUtils {
- public static String HEADER_LOG_ID =
"org.apache.synapse.transport.nhttp.headers";
+ public final static String HEADER_LOG_ID =
"org.apache.synapse.transport.nhttp.headers";
public static IOSession decorate(IOSession session, final String id) {
Log log = LogFactory.getLog(session.getClass());
