Author: indika
Date: Thu Jan 22 02:23:37 2009
New Revision: 736599
URL: http://svn.apache.org/viewvc?rev=736599&view=rev
Log:
some minor improvements
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java?rev=736599&r1=736598&r2=736599&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
Thu Jan 22 02:23:37 2009
@@ -144,8 +144,9 @@
}
} catch (Exception e) {
- log.fatal("Error starting up Scheduler", e);
- throw new SynapseException("Error starting up Scheduler", e);
+ String msg = "Error starting up Scheduler : " + e.getMessage();
+ log.fatal(msg, e);
+ throw new SynapseException(msg, e);
}
}
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=736599&r1=736598&r2=736599&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
Thu Jan 22 02:23:37 2009
@@ -65,7 +65,7 @@
cronTrigger.setCronExpression(cron);
trigger = cronTrigger;
} catch (ParseException e) {
- throw new SynapseTaskException("Error setting cron expression
: " + cron, log);
+ throw new SynapseTaskException("Error setting cron expression
: " + e.getMessage() + cron, log);
}
}
Modified:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java?rev=736599&r1=736598&r2=736599&view=diff
==============================================================================
---
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
(original)
+++
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
Thu Jan 22 02:23:37 2009
@@ -31,9 +31,7 @@
import javax.sql.DataSource;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
/**
* Keep all DataSources in the JNDI Tree
@@ -47,6 +45,8 @@
private InitialContext initialContext;
private Properties jndiProperties;
private static final Map<String, InitialContext> perDataSourceICMap = new
HashMap<String, InitialContext>();
+ private static final List<String> cachedNameList = new ArrayList<String>();
+
private boolean initialized = false;
public static JNDIBasedDataSourceRepository getInstance() {
@@ -234,6 +234,7 @@
} else {
handleException("Unsupported data source type : " + dsType);
}
+ cachedNameList.add(dataSourceName);
}
public void unRegister(String name) {
@@ -245,6 +246,7 @@
handleException("Error removing a Datasource with name : " +
name + " from the JNDI context : " + initialContext, e);
}
+ cachedNameList.remove(name);
}
/**
@@ -256,6 +258,12 @@
validateInitialized();
validateDSName(dsName);
+ if (!cachedNameList.contains(dsName)) {
+ if (log.isDebugEnabled()) {
+ log.debug("There is no Datasource with name " + dsName + " in
JNDI Datasource Repository");
+ }
+ return null;
+ }
if (log.isDebugEnabled()) {
log.debug("Getting a DataSource with name : " + dsName + " from
the JNDI tree.");
}
@@ -269,6 +277,7 @@
initialContext = null;
jndiProperties.clear();
perDataSourceICMap.clear();
+ cachedNameList.clear();
}
private InitialContext getCachedInitialContext(String name) {
