jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java
changeset 28695 427254b89b9e
parent 27574 2e8afdf5c6fb
child 31287 d6581a7c221f
equal deleted inserted replaced
28694:b99e1eee0669 28695:427254b89b9e
   174             }
   174             }
   175         }
   175         }
   176 
   176 
   177         String javah = ss.getSystemProperty( "java.home" );
   177         String javah = ss.getSystemProperty( "java.home" );
   178         String configFile = javah + File.separator +
   178         String configFile = javah + File.separator +
   179         "conf" + File.separator + "jaxp.properties";
   179         "lib" + File.separator + "jaxp.properties";
   180 
   180 
   181         // try to read from $java.home/conf/jaxp.properties
   181         // try to read from $java.home/lib/jaxp.properties
   182         try {
   182         try {
   183             if(firstTime){
   183             if(firstTime){
   184                 synchronized(cacheProps){
   184                 synchronized(cacheProps){
   185                     if(firstTime){
   185                     if(firstTime){
   186                         File f=new File( configFile );
   186                         File f=new File( configFile );
   191                         }
   191                         }
   192                     }
   192                     }
   193                 }
   193                 }
   194             }
   194             }
   195             final String factoryClassName = cacheProps.getProperty(propertyName);
   195             final String factoryClassName = cacheProps.getProperty(propertyName);
   196             debugPrintln("found " + factoryClassName + " in $java.home/conf/jaxp.properties");
   196             debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
   197 
   197 
   198             if (factoryClassName != null) {
   198             if (factoryClassName != null) {
   199                 xpathFactory = createInstance(factoryClassName, true);
   199                 xpathFactory = createInstance(factoryClassName, true);
   200                 if(xpathFactory != null){
   200                 if(xpathFactory != null){
   201                     return xpathFactory;
   201                     return xpathFactory;