AXIS-2875: Renamed a method that conflicts with a method in the superclass introduced in Java 1.6. Note that it is unlikely that this method is used by application code.

veithen · veithen · commit c1fb7e21f8bc · 2012-09-10T20:38:17.000Z
diff --git a/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java b/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
@@ -358,9 +358,12 @@ public String getResourceName() {
     }
 
     /**
-     * Clears the internal cache
+     * Clears the internal cache.
+     * <p>
+     * Note: In Axis 1.4 this method was named <code>clearCache</code>. However, that name conflicts
+     * with a method in the base class introduced in Java 1.6.
      */
-    public static void clearCache()
+    public static void clearBundleCache()
     {
         bundleCache.clear();
     }

Original file line number	Diff line number	Diff line change
`@@ -358,9 +358,12 @@ public String getResourceName() {`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`/**`
`361`		`- * Clears the internal cache`
	`361`	`+ * Clears the internal cache.`
	`362`	`+ * <p>`
	`363`	`+ * Note: In Axis 1.4 this method was named <code>clearCache</code>. However, that name conflicts`
	`364`	`+ * with a method in the base class introduced in Java 1.6.`
`362`	`365`	`*/`
`363`		`- public static void clearCache()`
	`366`	`+ public static void clearBundleCache()`
`364`	`367`	`{`
`365`	`368`	`bundleCache.clear();`
`366`	`369`	`}`