# HG changeset patch
# User lana
# Date 1356748312 28800
# Node ID 499be952a291cec1dc774a84a238941d6faf772d
# Parent  63815efd132f4639c45634774382498392b47d8b# Parent  d4aea0225e80dfbbf22431d54b404e3f3233e93b
Merge

diff -r 63815efd132f -r 499be952a291 src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
--- a/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java	Fri Dec 28 18:31:52 2012 -0800
@@ -1005,7 +1005,7 @@
     {
       Class clazz = ObjectFactory.findProviderClass(DOM_CLASS, true);
 
-      Method method = clazz.getMethod(DOM_LEVEL3_METHOD, null);
+      Method method = clazz.getMethod(DOM_LEVEL3_METHOD, (Class<?>[])null);
 
       // If we succeeded, we have loaded interfaces from a
       //  level 3 DOM somewhere
diff -r 63815efd132f -r 499be952a291 src/com/sun/org/apache/xerces/internal/impl/Version.java
--- a/src/com/sun/org/apache/xerces/internal/impl/Version.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/Version.java	Fri Dec 28 18:31:52 2012 -0800
@@ -74,7 +74,7 @@
 
     /** Version string.
      * @deprecated  getVersion() should be used instead.  */
-    public static String fVersion = "Xerces-J 2.7.1";
+    public static final String fVersion = getVersion();
 
     private static final String fImmutableVersion = "Xerces-J 2.7.1";
 
diff -r 63815efd132f -r 499be952a291 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Fri Dec 28 18:31:52 2012 -0800
@@ -193,9 +193,12 @@
                 null,
     };
 
-    protected static final char [] cdata = {'[','C','D','A','T','A','['};
-    protected static final char [] xmlDecl = {'<','?','x','m','l'};
-    protected static final char [] endTag = {'<','/'};
+    private static final char [] cdata = {'[','C','D','A','T','A','['};
+    private static final char [] endTag = {'<','/'};
+
+    //this variable is also used by XMLDocumentScannerImpl in the same package
+    static final char [] xmlDecl = {'<','?','x','m','l'};
+
     // debugging
 
     /** Debug scanner state. */
diff -r 63815efd132f -r 499be952a291 src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Fri Dec 28 18:31:52 2012 -0800
@@ -71,7 +71,7 @@
     /** Listeners which should know when load is being called */
     private Vector listeners = new Vector();
 
-    public static final boolean [] VALID_NAMES = new boolean[127];
+    private static final boolean [] VALID_NAMES = new boolean[127];
 
     /**
      * Debug printing of buffer. This debugging flag works best when you
diff -r 63815efd132f -r 499be952a291 src/javax/xml/transform/FactoryFinder.java
--- a/src/javax/xml/transform/FactoryFinder.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/javax/xml/transform/FactoryFinder.java	Fri Dec 28 18:31:52 2012 -0800
@@ -210,7 +210,7 @@
                 providerClass.getDeclaredMethod(
                     "newTransformerFactoryNoServiceLoader"
                 );
-                return creationMethod.invoke(null, null);
+                return creationMethod.invoke(null, (Object[])null);
             } catch (NoSuchMethodException exc) {
                 return null;
             } catch (Exception exc) {
diff -r 63815efd132f -r 499be952a291 src/javax/xml/validation/SchemaFactoryFinder.java
--- a/src/javax/xml/validation/SchemaFactoryFinder.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/javax/xml/validation/SchemaFactoryFinder.java	Fri Dec 28 18:31:52 2012 -0800
@@ -357,7 +357,7 @@
                 providerClass.getDeclaredMethod(
                     "newXMLSchemaFactoryNoServiceLoader"
                 );
-                return creationMethod.invoke(null, null);
+                return creationMethod.invoke(null, (Object[])null);
             } catch (NoSuchMethodException exc) {
                 return null;
             } catch (Exception exc) {
diff -r 63815efd132f -r 499be952a291 src/javax/xml/xpath/XPathFactoryFinder.java
--- a/src/javax/xml/xpath/XPathFactoryFinder.java	Thu Dec 27 12:15:03 2012 -0800
+++ b/src/javax/xml/xpath/XPathFactoryFinder.java	Fri Dec 28 18:31:52 2012 -0800
@@ -333,7 +333,7 @@
                 providerClass.getDeclaredMethod(
                     "newXPathFactoryNoServiceLoader"
                 );
-                return creationMethod.invoke(null, null);
+                return creationMethod.invoke(null, (Object[])null);
             } catch (NoSuchMethodException exc) {
                 return null;
             } catch (Exception exc) {