replaced literal string with final static field

Author: igal-getrailo

railo-java/railo-core/src/railo/runtime/config/ConfigImpl.java

@@ -115,6 +115,7 @@
 import railo.transformer.library.tag.TagLibTag;
 import railo.transformer.library.tag.TagLibTagAttr;
 import flex.messaging.config.ConfigMap;
+import static railo.runtime.db.DatasourceManagerImpl.QOQ_DATASOURCE_NAME;
 
 
 /**
@@ -2186,7 +2187,7 @@ public Map<String,DataSource> getDataSourcesAsMap() {
         Entry<String, DataSource> entry;
         while(it.hasNext()) {
             entry = it.next();
-            if(!entry.getKey().equals("_queryofquerydb"))
+            if(!entry.getKey().equals(QOQ_DATASOURCE_NAME))
                 map.put(entry.getKey(),entry.getValue());
         }        
         return map;

railo-java/railo-core/src/railo/runtime/db/DatasourceManagerImpl.java

@@ -20,7 +20,9 @@
  * this class handle multible db connection, transaction and logging
  */
 public final class DatasourceManagerImpl implements DataSourceManager {
-	
+
+	public static final String QOQ_DATASOURCE_NAME = "_queryofquerydb";
+
 	private ConfigImpl config;
 
 	boolean autoCommit=true;
@@ -61,7 +63,7 @@ public DatasourceConnection getConnection(PageContext pc,DataSource ds, String u
                     transConn=dc;
     			}
     			else if(!transConn.equals(dc)) {
-                	if("_queryofquerydb".equalsIgnoreCase(ds.getName())) return dc;
+                	if(QOQ_DATASOURCE_NAME.equalsIgnoreCase(ds.getName())) return dc;
     				throw new DatabaseException(
     						"can't use different connections inside a transaction",null,null,dc);
     			}

railo-java/railo-core/src/railo/runtime/db/HSQLDBHandler.java

@@ -30,6 +30,7 @@
 import railo.runtime.type.QueryColumn;
 import railo.runtime.type.QueryImpl;
 import railo.runtime.type.util.CollectionUtil;
+import static railo.runtime.db.DatasourceManagerImpl.QOQ_DATASOURCE_NAME;
 
 /**
  * class to reexecute queries on the resultset object inside the cfml enviroment
@@ -325,14 +326,11 @@ public static  QueryImpl __execute(PageContext pc, SQL sql, int maxrows, int fet
 			QueryImpl nqr=null;
 			ConfigImpl config = (ConfigImpl)pc.getConfig();
 			DatasourceConnectionPool pool = config.getDatasourceConnectionPool();
-			DatasourceConnection dc=pool.getDatasourceConnection(pc,config.getDataSource("_queryofquerydb"),"sa","");
+			DatasourceConnection dc=pool.getDatasourceConnection(pc,config.getDataSource(QOQ_DATASOURCE_NAME),"sa","");
 	    	Connection conn = dc.getConnection();
 	    	try {
 	    		DBUtil.setAutoCommitEL(conn,false);
-	    		
-		    	
-	    		
-	    		
+
 	        	//sql.setSQLString(HSQLUtil.sqlToZQL(sql.getSQLString(),false));
 		        try {
 	    			Iterator<String> it = tables.iterator();