cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r292270 - /cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Date Wed, 28 Sep 2005 19:24:02 GMT
Author: vgritsenko
Date: Wed Sep 28 12:23:57 2005
New Revision: 292270

URL: http://svn.apache.org/viewcvs?rev=292270&view=rev
Log:
preserve configured path for the error message

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java?rev=292270&r1=292269&r2=292270&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Wed Sep 28 12:23:57 2005
@@ -96,14 +96,15 @@
 
         m_daemonThreadPoolName = params.getParameter("thread-pool-name", m_daemonThreadPoolName);
 
-        String dbPath = params.getParameter("path", DEFAULT_DB_PATH);
+        final String dbCfgPath = params.getParameter("path", DEFAULT_DB_PATH);
+        String dbPath = dbCfgPath;
         // Test if we are running inside a WAR file
         if(dbPath.startsWith(ServerImpl.CONTEXT_PROTOCOL)) {
             dbPath = this.cocoonContext.getRealPath(dbPath.substring(ServerImpl.CONTEXT_PROTOCOL.length()));
         }
         if (dbPath == null) {
-            throw new ParameterException("The hsqldb cannot be used inside a WAR file. "
+
-                                         "Real path for <" + dbPath + "> is null.");
+            throw new ParameterException("The hsqldb cannot be used inside an unexpanded
WAR file. " +
+                                         "Real path for <" + dbCfgPath + "> is null.");
         }
 
         String dbName = params.getParameter("name", DEFAULT_DB_NAME);



Mime
View raw message