db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1083351 - /db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Date Sun, 20 Mar 2011 00:11:05 GMT
Author: kmarsden
Date: Sun Mar 20 00:11:05 2011
New Revision: 1083351

URL: http://svn.apache.org/viewvc?rev=1083351&view=rev
Log:
DERBY-5005 Error when fully qualifying a field from a view in an ORDER BY clause

Modified:
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1083351&r1=1083350&r2=1083351&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Sun Mar 20 00:11:05 2011
@@ -382,6 +382,26 @@ public class BaseDataFileFactory
 		//Log the JVM version info
 		logMsg(jvmVersion);
 
+		//Log derby.system.home It will have null value if user didn't set it
+		logMsg(Property.SYSTEM_HOME_PROPERTY+"=" + 
+				PropertyUtil.getSystemProperty(Property.SYSTEM_HOME_PROPERTY));
+		
+		//Log properties related to redirection of derby.log 
+		String target = 
+			PropertyUtil.getSystemProperty(Property.ERRORLOG_FILE_PROPERTY);
+		if (target != null)
+			logMsg(Property.ERRORLOG_FILE_PROPERTY+"=" + target);
+		
+		target = 
+			PropertyUtil.getSystemProperty(Property.ERRORLOG_METHOD_PROPERTY);
+		if (target != null)
+			logMsg(Property.ERRORLOG_METHOD_PROPERTY+"=" + target);
+		
+		target = 
+			PropertyUtil.getSystemProperty(Property.ERRORLOG_FIELD_PROPERTY);
+		if (target != null)
+			logMsg(Property.ERRORLOG_FIELD_PROPERTY+"=" + target);
+
         if (logBootTrace)
            Monitor.logThrowable(new Throwable("boot trace"));
 		uf = null;
@@ -2216,6 +2236,8 @@ public class BaseDataFileFactory
                      jvmversion += "\njava.runtime.version=" + currentProp;
                  if ((currentProp = PropertyUtil.getSystemProperty("java.fullversion")) !=
null)
                      jvmversion += "\njava.fullversion=" + currentProp ;         
+                 if ((currentProp = PropertyUtil.getSystemProperty("user.dir")) != null)
+                     jvmversion += "\nuser.dir=" + currentProp ;         
               }
               catch (SecurityException se) {
                    return se.getMessage();



Mime
View raw message