You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by ru...@apache.org on 2007/08/07 11:39:43 UTC
svn commit: r563433 - in /webservices/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/me...
Author: ruwan
Date: Tue Aug 7 02:39:40 2007
New Revision: 563433
URL: http://svn.apache.org/viewvc?view=rev&rev=563433
Log:
Adding log.isDebugEnabled check to the missing places and code cleaning
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportListener.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportSender.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/BackportWorkerPool.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/NativeWorkerPool.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientHandler.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientWorker.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ConnectionPool.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLListener.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLSender.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreRequestResponseTransport.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NHttpConfiguration.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ServerHandler.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/NativeWorkerPool.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/vfs/VFSTransportListener.java
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Tue Aug 7 02:39:40 2007
@@ -81,7 +81,7 @@
/**
* Add a named sequence into the local registry
- *
+ *
* @param key
* the name for the sequence
* @param mediator
@@ -94,7 +94,7 @@
/**
* Allow a dynamic sequence to be cached and made available through the
* local registry
- *
+ *
* @param key
* the key to lookup the sequence from the remote registry
* @param entry
@@ -108,7 +108,7 @@
/**
* Returns the map of defined sequences in the configuraiton excluding the
* fetched sequences from remote registry
- *
+ *
* @return Map of SequenceMediators defined in the local configuraion
*/
public Map getDefinedSequences() {
@@ -125,7 +125,7 @@
/**
* Return the sequence specified with the given key
- *
+ *
* @param key
* the key being referenced
* @return the sequence referenced by the key
@@ -158,7 +158,7 @@
/**
* Removes a sequence from the local registry
- *
+ *
* @param key
* of the sequence to be removed
*/
@@ -169,7 +169,7 @@
/**
* Return the main/default sequence to be executed. This is the sequence
* which will execute for all messages when message mediation takes place
- *
+ *
* @return the main mediator sequence
*/
public Mediator getMainSequence() {
@@ -179,7 +179,7 @@
/**
* Return the fault sequence to be executed when Synapse encounters a fault
* scenario during processing
- *
+ *
* @return the fault sequence
*/
public Mediator getFaultSequence() {
@@ -191,7 +191,7 @@
* source) are loaded during this definition phase, and the inability to
* load such a resource will not allow the definition of the resource to the
* local registry
- *
+ *
* @param key
* the key associated with the resource
* @param entry
@@ -218,7 +218,7 @@
/**
* Returns the map of defined entries in the configuraiton excluding the
* fetched entries from remote registry
- *
+ *
* @return Map of Entries defined in the local configuraion
*/
public Map getDefinedEntries() {
@@ -236,7 +236,7 @@
/**
* Get the resource with the given key
- *
+ *
* @param key
* the key of the resource required
* @return its value
@@ -260,7 +260,7 @@
/**
* Get the Entry object mapped to the given key
- *
+ *
* @param key
* the key for which the Entry is required
* @return its value
@@ -284,7 +284,7 @@
/**
* Deletes any reference mapped to the given key from the local registry
- *
+ *
* @param key
* the key of the reference to be removed
*/
@@ -294,7 +294,7 @@
/**
* Define a named endpoint with the given key
- *
+ *
* @param key
* the key for the endpoint
* @param endpoint
@@ -306,7 +306,7 @@
/**
* Add a dynamic endpoint definition to the local registry
- *
+ *
* @param key
* the key for the endpoint definition
* @param entry
@@ -319,7 +319,7 @@
/**
* Returns the map of defined endpoints in the configuraiton excluding the
* fetched endpoints from remote registry
- *
+ *
* @return Map of Endpoints defined in the local configuraion
*/
public Map getDefinedEndpoints() {
@@ -336,7 +336,7 @@
/**
* Get the definition of the endpoint with the given key
- *
+ *
* @param key
* the key of the endpoint
* @return the endpoint definition
@@ -369,7 +369,7 @@
/**
* Deletes the endpoint with the given key
- *
+ *
* @param key
* of the endpoint to be deleted
*/
@@ -379,7 +379,7 @@
/**
* Add a Proxy service to the configuration
- *
+ *
* @param name
* the name of the Proxy service
* @param proxy
@@ -391,7 +391,7 @@
/**
* Get the Proxy service with the given name
- *
+ *
* @param name
* the name being looked up
* @return the Proxy service
@@ -402,7 +402,7 @@
/**
* Deletes the Proxy Service named with the given name
- *
+ *
* @param name
* of the Proxy Service to be deleted
*/
@@ -429,7 +429,7 @@
/**
* Return the list of defined proxy services
- *
+ *
* @return the proxy services defined
*/
public Collection getProxyServices() {
@@ -438,7 +438,7 @@
/**
* Return an unmodifiable copy of the local registry
- *
+ *
* @return an unmodifiable copy of the local registry
*/
public Map getLocalRegistry() {
@@ -447,7 +447,7 @@
/**
* Get the remote registry defined (if any)
- *
+ *
* @return the currently defined remote registry
*/
public Registry getRegistry() {
@@ -456,7 +456,7 @@
/**
* Set the remote registry for the configuration
- *
+ *
* @param registry
* the remote registry for the configuration
*/
@@ -466,7 +466,7 @@
/**
* Set the Axis2 AxisConfiguration to the SynapseConfiguration
- *
+ *
* @param axisConfig
*/
public void setAxisConfiguration(AxisConfiguration axisConfig) {
@@ -475,7 +475,7 @@
/**
* Get the Axis2 AxisConfiguration for the SynapseConfiguration
- *
+ *
* @return AxisConfiguration of the Axis2
*/
public AxisConfiguration getAxisConfiguration() {
@@ -484,7 +484,7 @@
/**
* The path to the currently loaded configuration file
- *
+ *
* @return file path to synapse.xml
*/
public String getPathToConfigFile() {
@@ -493,7 +493,7 @@
/**
* Set the path to the loaded synapse.xml
- *
+ *
* @param pathToConfigFile
* path to the synapse.xml loaded
*/
@@ -523,7 +523,9 @@
}
public void destroy() {
- log.debug("destroy");
+ if (log.isDebugEnabled()) {
+ log.debug("destroy");
+ }
for (Iterator it = getProxyServices().iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof ProxyService) {
@@ -557,7 +559,9 @@
}
public void init(SynapseEnvironment se) {
- log.debug("init");
+ if (log.isDebugEnabled()) {
+ log.debug("init");
+ }
for (Iterator it = getProxyServices().iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof ProxyService) {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java Tue Aug 7 02:39:40 2007
@@ -130,17 +130,15 @@
}
}
-
- /**
- * This method will serialize the config using the supplied QName (looking
+ /**
+ * This method will serialize the config using the supplied QName (looking
* up the right class to do it)
- *
- * @param synCfg
- * @param qName
- * @param outputStream
- * @throws XMLStreamException
- */
- public void serializeStartup(OMElement parent, Startup startup) throws XMLStreamException {
+ *
+ * @param parent - Parent OMElement to which the created element will be added if not null
+ * @param startup - Startup to be serialized
+ * @throws XMLStreamException if the serialization encounter an error
+ */
+ public void serializeStartup(OMElement parent, Startup startup) throws XMLStreamException {
Class cls = (Class) serializerMap.get(startup.getTagQName());
if (cls == null) {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Tue Aug 7 02:39:40 2007
@@ -64,7 +64,9 @@
}
public void injectMessage(final MessageContext synCtx) {
- log.debug("Injecting MessageContext");
+ if (log.isDebugEnabled()) {
+ log.debug("Injecting MessageContext");
+ }
synCtx.setEnvironment(this);
if (synCtx.isResponse()) {
//Process statistics related to a sequence which has send mediator as a child,end point
@@ -115,7 +117,9 @@
}
} else {
- log.debug("Using Main Sequence for injected message");
+ if (log.isDebugEnabled()) {
+ log.debug("Using Main Sequence for injected message");
+ }
synCtx.getMainSequence().mediate(synCtx);
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java Tue Aug 7 02:39:40 2007
@@ -85,8 +85,10 @@
}
public void init(SynapseEnvironment se) {
- log.debug("init");
- for (Iterator it = mediators.iterator(); it.hasNext();) {
+ if (log.isDebugEnabled()) {
+ log.debug("init");
+ }
+ for (Iterator it = mediators.iterator(); it.hasNext();) {
Mediator m = (Mediator) it.next();
if (m instanceof ManagedLifecycle) {
((ManagedLifecycle)m).init(se);
@@ -94,8 +96,10 @@
}
}
public void destroy() {
- log.debug("destroy");
- for (Iterator it = mediators.iterator(); it.hasNext();) {
+ if (log.isDebugEnabled()) {
+ log.debug("destroy");
+ }
+ for (Iterator it = mediators.iterator(); it.hasNext();) {
Mediator m = (Mediator) it.next();
if (m instanceof ManagedLifecycle) {
((ManagedLifecycle)m).destroy();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java Tue Aug 7 02:39:40 2007
@@ -89,7 +89,7 @@
public void destroy() {
if (log.isDebugEnabled()) {
- log.debug("ClassMediator::destroy()");
+ log.debug("Class Mediator::destroy()");
}
if (mediator instanceof ManagedLifecycle) {
((ManagedLifecycle) mediator).destroy();
@@ -98,11 +98,13 @@
public void init(SynapseEnvironment se) {
if (log.isDebugEnabled()) {
- log.debug("ClassMediator::init()");
+ log.debug("Class Mediator::init()");
}
if (mediator == null) {
- log.debug("init called before mediator set");
- return;
+ if (log.isDebugEnabled()) {
+ log.debug("init called before mediator set");
+ }
+ return;
}
if (mediator instanceof ManagedLifecycle) {
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractPollingTransportListener.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractPollingTransportListener.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractPollingTransportListener.java Tue Aug 7 02:39:40 2007
@@ -60,8 +60,10 @@
task = new TimerTask() {
public void run() {
if (pollInProgress) {
- log.debug("Transport " + transportName +
- " onPoll() trigger : already executing poll..");
+ if (log.isDebugEnabled()) {
+ log.debug("Transport " + transportName +
+ " onPoll() trigger : already executing poll..");
+ }
return;
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportListener.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportListener.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportListener.java Tue Aug 7 02:39:40 2007
@@ -199,7 +199,9 @@
engine.receive(msgCtx);
} catch (AxisFault e) {
e.printStackTrace();
- log.debug("Error receiving message", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Error receiving message", e);
+ }
if (msgCtx.isServerSide()) {
engine.sendFault(MessageContextBuilder.createFaultMessageContext(msgCtx, e));
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportSender.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportSender.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/AbstractTransportSender.java Tue Aug 7 02:39:40 2007
@@ -134,7 +134,9 @@
try {
engine.receive(msgCtx);
} catch (AxisFault e) {
- log.debug("Error receiving message", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Error receiving message", e);
+ }
if (msgCtx.isServerSide()) {
engine.sendFault(MessageContextBuilder.createFaultMessageContext(msgCtx, e));
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/BackportWorkerPool.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/BackportWorkerPool.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/BackportWorkerPool.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/BackportWorkerPool.java Tue Aug 7 02:39:40 2007
@@ -19,7 +19,9 @@
public BackportWorkerPool(int core, int max, int keepAlive,
int queueLength, String threadGroupName, String threadGroupId) {
- log.debug("Using backport of the util.concurrent package..");
+ if (log.isDebugEnabled()) {
+ log.debug("Using backport of the util.concurrent package..");
+ }
executor = new ThreadPoolExecutor(
core, max, keepAlive,
TimeUnit.SECONDS,
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/NativeWorkerPool.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/NativeWorkerPool.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/NativeWorkerPool.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/base/threads/NativeWorkerPool.java Tue Aug 7 02:39:40 2007
@@ -20,7 +20,9 @@
public NativeWorkerPool(int core, int max, int keepAlive,
int queueLength, String threadGroupName, String threadGroupId) {
- log.debug("Using native util.concurrent package..");
+ if (log.isDebugEnabled()) {
+ log.debug("Using native util.concurrent package..");
+ }
executor = new ThreadPoolExecutor(
core, max, keepAlive,
TimeUnit.SECONDS,
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java Tue Aug 7 02:39:40 2007
@@ -200,7 +200,9 @@
} catch (JMSException ignore) {}
} else {
- log.debug("Initializing the JMS connection factory : " + name);
+ if (log.isDebugEnabled()) {
+ log.debug("Initializing the JMS connection factory : " + name);
+ }
}
// get the CF reference freshly [again] from JNDI
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java Tue Aug 7 02:39:40 2007
@@ -88,14 +88,18 @@
log.debug(sb.toString());
}
} catch (JMSException e) {
- log.debug("Error reading JMS message headers for debug logging", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Error reading JMS message headers for debug logging", e);
+ }
}
// has this message already expired? expiration time == 0 means never expires
try {
long expiryTime = message.getJMSExpiration();
if (expiryTime > 0 && System.currentTimeMillis() > expiryTime) {
- log.debug("Discard expired message with ID : " + message.getJMSMessageID());
+ if (log.isDebugEnabled()) {
+ log.debug("Discard expired message with ID : " + message.getJMSMessageID());
+ }
return;
}
} catch (JMSException ignore) {}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java Tue Aug 7 02:39:40 2007
@@ -142,7 +142,9 @@
try {
return (Destination) context.lookup(destinationName);
} catch (NameNotFoundException e) {
- log.debug("Cannot locate destination : " + destinationName + " using " + url, e);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot locate destination : " + destinationName + " using " + url, e);
+ }
} catch (NamingException e) {
handleException("Cannot locate destination : " + destinationName + " using " + url, e);
}
@@ -158,7 +160,9 @@
try {
return (Destination) jmsConnectionFactory.getContext().lookup(replyDest);
} catch (NameNotFoundException e) {
- log.debug("Cannot locate reply destination : " + replyDest, e);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot locate reply destination : " + replyDest, e);
+ }
} catch (NamingException e) {
handleException("Cannot locate reply destination : " + replyDest, e);
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java Tue Aug 7 02:39:40 2007
@@ -150,7 +150,9 @@
* @return source channel to read serialized message contents
*/
public ReadableByteChannel getSourceChannel() {
- log.debug("get source channel of the pipe on which the outgoing response is written");
+ if (log.isDebugEnabled()) {
+ log.debug("get source channel of the pipe on which the outgoing response is written");
+ }
return pipe.source();
}
@@ -161,7 +163,9 @@
*/
public void streamMessageContents() throws AxisFault {
- log.debug("start streaming outgoing http request");
+ if (log.isDebugEnabled()) {
+ log.debug("start streaming outgoing http request");
+ }
OutputStream out = Channels.newOutputStream(pipe.sink());
messageFormatter.writeTo(msgContext, format, out, true);
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientHandler.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientHandler.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientHandler.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientHandler.java Tue Aug 7 02:39:40 2007
@@ -180,7 +180,9 @@
* @param conn the connection being processed
*/
public void timeout(final NHttpClientConnection conn) {
- log.debug("Connection Timeout");
+ if (log.isDebugEnabled()) {
+ log.debug("Connection Timeout");
+ }
shutdownConnection(conn);
}
@@ -276,7 +278,9 @@
switch (response.getStatusLine().getStatusCode()) {
case HttpStatus.SC_ACCEPTED : {
- log.debug("Received a 202 Accepted response");
+ if (log.isDebugEnabled()) {
+ log.debug("Received a 202 Accepted response");
+ }
// create a dummy message with an empty SOAP envelope and a property
// NhttpConstants.SC_ACCEPTED set to Boolean.TRUE to indicate this is a
@@ -326,7 +330,9 @@
if (contentType != null &&
(contentType.getValue().indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE) >= 0) ||
contentType.getValue().indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) >=0) {
- log.debug("Received an internal server error with a SOAP payload");
+ if (log.isDebugEnabled()) {
+ log.debug("Received an internal server error with a SOAP payload");
+ }
processResponse(conn, context, response);
return;
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientWorker.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientWorker.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientWorker.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ClientWorker.java Tue Aug 7 02:39:40 2007
@@ -87,8 +87,10 @@
// context, as it may get a 202 accepted or 200. So if the operation is complete ignore
// this message, else, create a new message context and handle this
if (responseMsgCtx == null && outMsgCtx.getOperationContext().isComplete()) {
- log.debug("Error getting IN message context from the operation context. " +
- "Possibly an RM terminate sequence message");
+ if (log.isDebugEnabled()) {
+ log.debug("Error getting IN message context from the operation context. " +
+ "Possibly an RM terminate sequence message");
+ }
return;
} else {
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ConnectionPool.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ConnectionPool.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ConnectionPool.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ConnectionPool.java Tue Aug 7 02:39:40 2007
@@ -95,7 +95,9 @@
connections.add(conn);
- log.debug("Released a connection to host: " + host.getHostName() + " on port : " +
- host.getPort() + " to the connection pool of current size : " + connections.size());
+ if (log.isDebugEnabled()) {
+ log.debug("Released a connection to host: " + host.getHostName() + " on port : " +
+ host.getPort() + " to the connection pool of current size : " + connections.size());
+ }
}
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java Tue Aug 7 02:39:40 2007
@@ -189,7 +189,9 @@
* @throws AxisFault
*/
public void start() throws AxisFault {
- log.debug("Starting Listener...");
+ if (log.isDebugEnabled()) {
+ log.debug("Starting Listener...");
+ }
// start the Listener in a new seperate thread
Thread t = new Thread(new Runnable() {
public void run() {
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLListener.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLListener.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLListener.java Tue Aug 7 02:39:40 2007
@@ -92,7 +92,9 @@
try {
KeyStore keyStore = KeyStore.getInstance(type);
URL url = getClass().getClassLoader().getResource(location);
- log.debug("Loading Key Store from URL : " + url);
+ if (log.isDebugEnabled()) {
+ log.debug("Loading Key Store from URL : " + url);
+ }
keyStore.load(url.openStream(), storePassword.toCharArray());
KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
@@ -118,7 +120,9 @@
try {
KeyStore trustStore = KeyStore.getInstance(type);
URL url = getClass().getClassLoader().getResource(location);
- log.debug("Loading Trust Key Store from URL : " + url);
+ if (log.isDebugEnabled()) {
+ log.debug("Loading Trust Key Store from URL : " + url);
+ }
trustStore.load(url.openStream(), storePassword.toCharArray());
TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance(
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLSender.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLSender.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSSLSender.java Tue Aug 7 02:39:40 2007
@@ -72,7 +72,9 @@
try {
KeyStore keyStore = KeyStore.getInstance(type);
URL url = getClass().getClassLoader().getResource(location);
- log.debug("Loading Key Store from URL : " + url);
+ if (log.isDebugEnabled()) {
+ log.debug("Loading Key Store from URL : " + url);
+ }
keyStore.load(url.openStream(), storePassword.toCharArray());
KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
@@ -98,7 +100,9 @@
try {
KeyStore trustStore = KeyStore.getInstance(type);
URL url = getClass().getClassLoader().getResource(location);
- log.debug("Loading Trust Key Store from URL : " + url);
+ if (log.isDebugEnabled()) {
+ log.debug("Loading Trust Key Store from URL : " + url);
+ }
trustStore.load(url.openStream(), storePassword.toCharArray());
TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance(
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java Tue Aug 7 02:39:40 2007
@@ -286,10 +286,14 @@
if (conn == null) {
ioReactor.connect(new InetSocketAddress(url.getHost(), port),
null, axis2Req, sessionRequestCallback);
- log.debug("A new connection established");
+ if (log.isDebugEnabled()) {
+ log.debug("A new connection established");
+ }
} else {
((ClientHandler) handler).submitRequest(conn, axis2Req);
- log.debug("An existing connection reused");
+ if (log.isDebugEnabled()) {
+ log.debug("An existing connection reused");
+ }
}
axis2Req.streamMessageContents();
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreRequestResponseTransport.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreRequestResponseTransport.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreRequestResponseTransport.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/HttpCoreRequestResponseTransport.java Tue Aug 7 02:39:40 2007
@@ -46,17 +46,23 @@
}
public void acknowledgeMessage(MessageContext msgContext) throws AxisFault {
- log.debug("Acking one-way request");
+ if (log.isDebugEnabled()) {
+ log.debug("Acking one-way request");
+ }
}
public void awaitResponse() throws InterruptedException, AxisFault {
- log.debug("Returning thread but keeping socket open -- awaiting response");
+ if (log.isDebugEnabled()) {
+ log.debug("Returning thread but keeping socket open -- awaiting response");
+ }
status = RequestResponseTransportStatus.WAITING;
msgContext.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, "SKIP");
}
public void signalResponseReady() {
- log.debug("Signal response available");
+ if (log.isDebugEnabled()) {
+ log.debug("Signal response available");
+ }
status = RequestResponseTransportStatus.SIGNALLED;
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NHttpConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NHttpConfiguration.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NHttpConfiguration.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NHttpConfiguration.java Tue Aug 7 02:39:40 2007
@@ -129,7 +129,9 @@
}
if (val != null && Integer.valueOf(val).intValue() > 0) {
- log.debug("Using nhttp tuning parameter : " + name + " = " + val);
+ if (log.isDebugEnabled()) {
+ log.debug("Using nhttp tuning parameter : " + name + " = " + val);
+ }
return Integer.valueOf(val).intValue();
}
return def;
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ServerHandler.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ServerHandler.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ServerHandler.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/ServerHandler.java Tue Aug 7 02:39:40 2007
@@ -235,8 +235,10 @@
public void timeout(final NHttpServerConnection conn) {
HttpRequest req = (HttpRequest) conn.getContext().getAttribute(HttpContext.HTTP_REQUEST);
if (req != null) {
- log.debug("Connection Timeout for request to : " + req.getRequestLine().getUri() +
- " Probably the keepalive connection was closed");
+ if (log.isDebugEnabled()) {
+ log.debug("Connection Timeout for request to : " + req.getRequestLine().getUri() +
+ " Probably the keepalive connection was closed");
+ }
} else {
log.warn("Connection Timeout");
}
@@ -276,9 +278,12 @@
*/
public void exception(NHttpServerConnection conn, IOException e) {
if (e instanceof ConnectionClosedException ||
- e.getMessage().contains("Connection reset by peer") ||
- e.getMessage().contains("forcibly closed")) {
- log.debug("I/O error (Probably the keepalive connection was closed):" + e.getMessage());
+ e.getMessage().contains("Connection reset by peer") ||
+ e.getMessage().contains("forcibly closed")) {
+ if (log.isDebugEnabled()) {
+ log.debug("I/O error (Probably the keepalive connection " +
+ "was closed):" + e.getMessage());
+ }
} else {
log.error("I/O error: " + e.getMessage());
}
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java Tue Aug 7 02:39:40 2007
@@ -39,7 +39,9 @@
public BackportWorkerPool(int core, int max, int keepAlive,
int queueLength, String threadGroupName, String threadGroupId) {
- log.debug("Using backport of the util.concurrent package..");
+ if (log.isDebugEnabled()) {
+ log.debug("Using backport of the util.concurrent package..");
+ }
executor = new ThreadPoolExecutor(
core, max, keepAlive,
TimeUnit.SECONDS,
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/NativeWorkerPool.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/NativeWorkerPool.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/NativeWorkerPool.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/util/NativeWorkerPool.java Tue Aug 7 02:39:40 2007
@@ -39,7 +39,9 @@
public NativeWorkerPool(int core, int max, int keepAlive,
int queueLength, String threadGroupName, String threadGroupId) {
- log.debug("Using native util.concurrent package..");
+ if (log.isDebugEnabled()) {
+ log.debug("Using native util.concurrent package..");
+ }
executor = new ThreadPoolExecutor(
core, max, keepAlive,
TimeUnit.SECONDS,
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/vfs/VFSTransportListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/vfs/VFSTransportListener.java?view=diff&rev=563433&r1=563432&r2=563433
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/vfs/VFSTransportListener.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/vfs/VFSTransportListener.java Tue Aug 7 02:39:40 2007
@@ -210,7 +210,9 @@
moveOrDeleteAfterProcessing(entry, fileObject);
} else {
- log.debug("Unable to access or read file or directory : " + fileURI);
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to access or read file or directory : " + fileURI);
+ }
}
} catch (FileSystemException e) {
@@ -472,8 +474,10 @@
task = new TimerTask() {
public void run() {
if (pollInProgress) {
- log.debug("Transport " + transportName +
- " onPoll() trigger : already executing poll..");
+ if (log.isDebugEnabled()) {
+ log.debug("Transport " + transportName +
+ " onPoll() trigger : already executing poll..");
+ }
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org