Author: gk
Date: Wed Aug 10 14:18:56 2016
New Revision: 1755753
URL: http://svn.apache.org/viewvc?rev=1755753&view=rev
Log:
- save a true map, not hashtable
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=1755753&r1=1755752&r2=1755753&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Wed Aug 10 14:18:56 2016
@@ -673,7 +673,7 @@ public class TurbinePullService
synchronized (data.getSession())
{
// first try and fetch the tool from the user's
- // hashtable
+ // hashmap
Object tool = data.getSession().getAttribute(
SESSION_TOOLS_ATTRIBUTE_PREFIX
+ toolData.toolClassName);
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1755753&r1=1755752&r2=1755753&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Wed Aug 10 14:18:56 2016
@@ -1108,7 +1108,7 @@ public class DefaultTurbineRunData
/**
* Gets JNDI Contexts.
*
- * @return a hashtable.
+ * @return a hashmap.
*/
@Override
public Map<String, Context> getJNDIContexts()
@@ -1123,7 +1123,7 @@ public class DefaultTurbineRunData
/**
* Sets JNDI Contexts.
*
- * @param contexts a hashtable.
+ * @param contexts a hashmap.
*/
@Override
public void setJNDIContexts(Map<String, Context> contexts)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1755753&r1=1755752&r2=1755753&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
Wed Aug 10 14:18:56 2016
@@ -457,7 +457,7 @@ public class DefaultSecurityService
* to exist in the storage.
*
* LastLogin, AccessCounter, persistent pull tools, and any data stored
- * in the permData hashtable that is not mapped to a column will be saved.
+ * in the permData hashmap that is not mapped to a column will be saved.
*
* @exception UnknownEntityException if the user's account does not
* exist in the database.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java?rev=1755753&r1=1755752&r2=1755753&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
Wed Aug 10 14:18:56 2016
@@ -173,7 +173,7 @@ public class PassiveUserManager implemen
* to exist in the storage.
*
* LastLogin, AccessCounter, persistent pull tools, and any data stored
- * in the permData hashtable that is not mapped to a column will be saved.
+ * in the permData hashmap that is not mapped to a column will be saved.
*
* @exception UnknownEntityException if the user's account does not
* exist in the database.
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java?rev=1755753&r1=1755752&r2=1755753&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java Wed
Aug 10 14:18:56 2016
@@ -29,7 +29,6 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.util.Hashtable;
import java.util.Map;
/**
@@ -50,11 +49,9 @@ public abstract class ObjectUtils
*
* @exception Exception A generic exception.
*/
- public static byte[] serializeMap(Map<String, Object> map)
- throws Exception
+ public static byte[] serializeMap(Map<String, Object> map)
+ throws Exception
{
- Map<String, Serializable> saveData =
- new Hashtable<String, Serializable>(map.size());
String key = null;
Object value = null;
byte[] byteArray = null;
@@ -63,9 +60,9 @@ public abstract class ObjectUtils
{
key = entry.getKey();
value = entry.getValue();
- if (value instanceof Serializable)
+ if (! (value instanceof Serializable))
{
- saveData.put (key, (Serializable)value);
+ throw new Exception("Could not serialize, value is not
serializable:" + value);
}
}
@@ -79,7 +76,7 @@ public abstract class ObjectUtils
bos = new BufferedOutputStream(baos);
out = new ObjectOutputStream(bos);
- out.writeObject(saveData);
+ out.writeObject(map);
out.flush();
bos.flush();
