[Tynstep-svn] r65 - in trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server: common handler

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2009-12-18 11:37:55 -0700 (Fri, 18 Dec 2009)
New Revision: 65

Modified:
   trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/common/ConfigProvider.java
   trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java
Log:


Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/common/ConfigProvider.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/common/ConfigProvider.java	2009-12-18 16:25:41 UTC (rev 64)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/common/ConfigProvider.java	2009-12-18 18:37:55 UTC (rev 65)
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Enumeration;
 import java.util.Properties;
 
 public class ConfigProvider {
@@ -21,7 +22,8 @@
      * @throws Exception
      */
     public void load() throws ConfigNotLoadedException {
-        URL url = ClassLoader.getSystemResource("com/tyndalehouse/step/web/server/config/environment.properties");
+    	ClassLoader loader = Thread.currentThread().getContextClassLoader();
+    	URL url = loader.getResource("com/tyndalehouse/step/web/server/config/environment.properties");
         try {
 			p.load(url.openStream());
 		} catch (IOException e) {

Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java	2009-12-18 16:25:41 UTC (rev 64)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java	2009-12-18 18:37:55 UTC (rev 65)
@@ -33,7 +33,7 @@
 			GetTimelineUISetupCommand cmd, ExecutionContext arg1)
 			throws ActionException {
 		//we need to do how many timelines there are, the min and max of each of them
-		Connection conn = null;
+		Connection conn = null; 
 		try {
 			conn = DbProvider.getConnection();