felipeal 2004/09/13 19:13:42
Modified: i18n/src/org/apache/taglibs/i18n MessageTag.java
Log:
fix on release() so it checks if _arguments is null before calling its clear()
method - thanks Anderson Jonathan for the patch
Revision Changes Path
1.10 +11 -6 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java
Index: MessageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MessageTag.java 4 Jun 2004 04:35:44 -0000 1.9
+++ MessageTag.java 14 Sep 2004 02:13:42 -0000 1.10
@@ -1,18 +1,18 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.i18n;
@@ -156,7 +156,10 @@
public final void release()
{
super.release();
- _arguments.clear();
+ if (_arguments != null)
+ {
+ _arguments.clear();
+ }
_key = null;
_value = null;
_bundle = null;
@@ -187,7 +190,9 @@
}
// Reset the arguments
- _arguments.clear();
+ if (_arguments != null) {
+ _arguments.clear();
+ }
if ( _args != null ) {
_arguments.addAll(Arrays.asList(_args));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
