Author: henning
Date: Mon Oct 9 14:41:39 2006
New Revision: 454525
URL: http://svn.apache.org/viewvc?view=rev&rev=454525
Log:
Remove Serializable from InternalContextBase. Fixes VELOCITY-458.
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java
jakarta/velocity/engine/trunk/xdocs/changes.xml
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java?view=diff&rev=454525&r1=454524&r2=454525
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java
Mon Oct 9 14:41:39 2006
@@ -18,12 +18,10 @@
import java.util.HashMap;
import java.util.Stack;
-import java.io.Serializable;
-
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
import org.apache.velocity.app.event.EventCartridge;
import org.apache.velocity.runtime.resource.Resource;
+import org.apache.velocity.util.introspection.IntrospectionCacheData;
/**
* class to encapsulate the 'stuff' for internal operation of velocity.
@@ -40,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @version $Id$
*/
-class InternalContextBase implements InternalHousekeepingContext,
InternalEventContext, Serializable
+class InternalContextBase implements InternalHousekeepingContext,
InternalEventContext
{
/**
* Version Id for serializable
Modified: jakarta/velocity/engine/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/xdocs/changes.xml?view=diff&rev=454525&r1=454524&r2=454525
==============================================================================
--- jakarta/velocity/engine/trunk/xdocs/changes.xml (original)
+++ jakarta/velocity/engine/trunk/xdocs/changes.xml Mon Oct 9 14:41:39 2006
@@ -24,7 +24,11 @@
<body>
<release version="1.5-dev" date="in Subversion">
- <action type="fix" dev="wglass" issue="VELOCITY-449" due-to="Alexey
Panchenko">
+ <action type="fix" dev="henning" issue="VELOCITY-458">
+ Removed Serializable from InternalContextBase, because one of the
members is not serializable anyway so this never worked (Found by Findbugs).
+ </action>
+
+ <action type="fix" dev="henning" issue="VELOCITY-449" due-to="Alexey
Panchenko">
Add an additional pair of Executors that are smart about Map.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
