[Unicore-cvs-commits] SF.net SVN: unicore: [2934] wsrflite/wsrfcore/trunk

[<bsc...@us...>]

Revision: 2934
          http://unicore.svn.sourceforge.net/unicore/?rev=2934&view=rev
Author:   bschuller
Date:     2008-05-14 01:47:11 -0700 (Wed, 14 May 2008)

Log Message:
-----------
fix threadlocal var

Modified Paths:
--------------
    wsrflite/wsrfcore/trunk/pom.xml
    wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java
    wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java
    wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java

Modified: wsrflite/wsrfcore/trunk/pom.xml
===================================================================
--- wsrflite/wsrfcore/trunk/pom.xml	2008-05-14 08:30:23 UTC (rev 2933)
+++ wsrflite/wsrfcore/trunk/pom.xml	2008-05-14 08:47:11 UTC (rev 2934)
@@ -3,7 +3,7 @@
   <groupId>de.fzj.unicore.wsrflite</groupId>
   <artifactId>wsrflite</artifactId>
   <name>UNICORE Lightweight WSRF Environment</name>
-  <version>1.8.9-SNAPSHOT</version>
+  <version>1.8.8-SNAPSHOT</version>
   <url>http://unicore.sourceforge.net/wsrflite</url>
   <developers>
     <developer>

Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java	2008-05-14 08:30:23 UTC (rev 2933)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java	2008-05-14 08:47:11 UTC (rev 2934)
@@ -65,7 +65,8 @@
 
 	//contains security objects from the message context
 	//it is thread local because it is generated from the web service request
-	private static InheritableThreadLocal<Map<String,Object>> securityContexts=new InheritableThreadLocal<Map<String,Object>>();
+	//and might be accessed from multiple threads
+	private transient InheritableThreadLocal<Map<String,Object>> securityContexts=new InheritableThreadLocal<Map<String,Object>>();
 	
 	private String uniqueID;
 	

Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java	2008-05-14 08:30:23 UTC (rev 2933)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java	2008-05-14 08:47:11 UTC (rev 2934)
@@ -33,6 +33,7 @@
 
 package de.fzj.unicore.wsrflite.persistence;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;

Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java	2008-05-14 08:30:23 UTC (rev 2933)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java	2008-05-14 08:47:11 UTC (rev 2934)
@@ -34,13 +34,11 @@
 package de.fzj.unicore.wsrflite.xmlbeans.impl;
 
 import java.io.Serializable;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 import javax.xml.namespace.QName;
 
@@ -90,8 +88,6 @@
 import de.fzj.unicore.wsrflite.impl.WSRFInstanceImpl;
 import de.fzj.unicore.wsrflite.persistence.ConcurrentAccess;
 import de.fzj.unicore.wsrflite.persistence.Persist;
-import de.fzj.unicore.wsrflite.persistence.PersistenceManager;
-import de.fzj.unicore.wsrflite.persistence.PersistenceSettings;
 import de.fzj.unicore.wsrflite.utils.Utilities;
 import de.fzj.unicore.wsrflite.xmlbeans.BaseFault;
 import de.fzj.unicore.wsrflite.xmlbeans.ModifiableResourceProperty;
@@ -121,7 +117,7 @@
 	public static final int UPDATE=4;
 	
 	@Persist()
-	protected HashMap<QName,ResourceProperty> properties;
+	protected HashMap<QName,ResourceProperty<?>> properties;
 	
 	/**
 	 * retrieve a resource property by its QName. The update() method on the 
@@ -132,7 +128,7 @@
 	 */
 	protected XmlObject[] getResourceProperty(QName qn){
 		try{
-			ResourceProperty rp=properties.get(qn);
+			ResourceProperty<?> rp=properties.get(qn);
 			if(rp!=null){
 				return rp.update().getXml();
 			}
@@ -164,7 +160,7 @@
 	 */
 	public WSResourceImpl() {
 		super();
-		properties=new HashMap<QName, ResourceProperty>();
+		properties=new HashMap<QName, ResourceProperty<?>>();
 	}
 	
 	private QName[] getResourcePropertyQNames() {
@@ -528,7 +524,7 @@
 	@Override
 	public void activate(Map<String,Serializable> state){
 		super.activate(state);
-		for(ResourcePropertyBase p: properties.values()){
+		for(ResourcePropertyBase<?,?> p: properties.values()){
 			p.setResource(this);
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.