rsitze 2002/09/20 10:35:35 Modified: java/src/org/apache/axis/utils Messages.java java/src/org/apache/axis/i18n Messages.java Log: Other cleanup now that proper function has been restored. Revision Changes Path 1.6 +5 -1 xml-axis/java/src/org/apache/axis/utils/Messages.java Index: Messages.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Messages.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Messages.java 20 Sep 2002 16:35:36 -0000 1.5 +++ Messages.java 20 Sep 2002 17:35:34 -0000 1.6 @@ -85,7 +85,11 @@ private static final String resourceName = MessagesConstants.resourceName; private static final Locale locale = MessagesConstants.locale; - private static final ResourceBundle parent = null; + private static final ResourceBundle parent = + (MessagesConstants.rootPackageName == packageName) + ? null + : MessagesConstants.rootBundle; + /***** NO NEED TO CHANGE ANYTHING BELOW *****/ 1.3 +1 -0 xml-axis/java/src/org/apache/axis/i18n/Messages.java Index: Messages.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/Messages.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Messages.java 20 Sep 2002 16:35:36 -0000 1.2 +++ Messages.java 20 Sep 2002 17:35:35 -0000 1.3 @@ -106,6 +106,7 @@ ? null : MessagesConstants.rootBundle; + /***** NO NEED TO CHANGE ANYTHING BELOW *****/ private static final MessageBundle messageBundle =