You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2002/10/29 17:17:35 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/lib/sql DefaultConnectionPool.java
mkwan 2002/10/29 08:17:35
Modified: java/src/org/apache/xalan/lib ExsltBase.java
ExsltStrings.java
java/src/org/apache/xalan/lib/sql DefaultConnectionPool.java
Log:
Fix JDK 1.1.8 compatibility problems.
Replace methods calls that are only in Java2 by JDK 1.1 equivalents.
For DefaultConnectionPool.java, use reflection mechanism to invoke
Thread.getContextClassLoader() instead of hard-coded invocation.
Revision Changes Path
1.2 +1 -1 xml-xalan/java/src/org/apache/xalan/lib/ExsltBase.java
Index: ExsltBase.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExsltBase.java 23 Sep 2002 16:22:40 -0000 1.1
+++ ExsltBase.java 29 Oct 2002 16:17:35 -0000 1.2
@@ -108,7 +108,7 @@
String str = toString(n);
try
{
- d = Double.parseDouble(str);
+ d = Double.valueOf(str).doubleValue();
}
catch (NumberFormatException e)
{
1.5 +4 -7 xml-xalan/java/src/org/apache/xalan/lib/ExsltStrings.java
Index: ExsltStrings.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltStrings.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExsltStrings.java 23 Sep 2002 16:22:41 -0000 1.4
+++ ExsltStrings.java 29 Oct 2002 16:17:35 -0000 1.5
@@ -109,23 +109,20 @@
if (targetStr.length() >= paddingStr.length())
return targetStr.substring(0, paddingStr.length());
- StringBuffer sb = new StringBuffer(paddingStr);
if (type.equals("right"))
{
- sb.replace(paddingStr.length() - targetStr.length(), paddingStr.length(), targetStr);
+ return paddingStr.substring(0, paddingStr.length() - targetStr.length()) + targetStr;
}
else if (type.equals("center"))
{
int startIndex = (paddingStr.length() - targetStr.length()) / 2;
- sb.replace(startIndex, startIndex + targetStr.length(), targetStr);
+ return paddingStr.substring(0, startIndex) + targetStr + paddingStr.substring(startIndex + targetStr.length());
}
// Default is left
else
{
- sb.replace(0, targetStr.length(), targetStr);
- }
-
- return sb.toString();
+ return targetStr + paddingStr.substring(paddingStr.length() - targetStr.length());
+ }
}
/**
1.12 +17 -3 xml-xalan/java/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
Index: DefaultConnectionPool.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultConnectionPool.java 6 Sep 2002 07:19:53 -0000 1.11
+++ DefaultConnectionPool.java 29 Oct 2002 16:17:35 -0000 1.12
@@ -64,6 +64,7 @@
import java.util.Enumeration;
import java.util.Properties;
import java.util.Vector;
+import java.lang.reflect.Method;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
@@ -476,9 +477,22 @@
try
{
-// We need to implement the context classloader
-// Class.forName( m_driver );
- Class cls = Thread.currentThread().getContextClassLoader().loadClass(m_driver);
+ // We need to implement the context classloader
+ Class cls = null;
+ try
+ {
+ Method m = Thread.class.getMethod("getContextClassLoader", null);
+ ClassLoader classLoader = (ClassLoader) m.invoke(Thread.currentThread(), null);
+ cls = classLoader.loadClass(m_driver);
+ }
+ catch (Exception e)
+ {
+ cls = Class.forName(m_driver);
+ }
+
+ if (cls == null)
+ cls = Class.forName(m_driver);
+
// We have also had problems with drivers unloading
// load an instance that will get freed with the class.
m_Driver = cls.newInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org