[Openproj-commitlog] openproj_core/src/com/projity/server/data SerializedDataObject.java, 1.5, 1.6 CommonDataObject.java, 1.4, 1.5

[l <sur...@us...>]

Update of /cvsroot/openproj/openproj_core/src/com/projity/server/data
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20212/src/com/projity/server/data

Modified Files:
	SerializedDataObject.java CommonDataObject.java 
Log Message:


Index: SerializedDataObject.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/server/data/SerializedDataObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SerializedDataObject.java	15 Dec 2008 14:36:23 -0000	1.5
+++ SerializedDataObject.java	17 Dec 2008 21:05:15 -0000	1.6
@@ -181,7 +181,7 @@
         return isLocal(data.getUniqueId());
     }
     public static boolean isLocal(long uniqueId){
-        return uniqueId<MAX_LOCAL_ID;
+        return CommonDataObject.isLocal(uniqueId);
     }
     public static void makeGlobal(DataObject data) throws UniqueIdException{
     	if (isLocal(data)) data.setUniqueId(SessionFactory.getInstance().getSession(false).getId());

Index: CommonDataObject.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/server/data/CommonDataObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CommonDataObject.java	15 Dec 2008 14:36:23 -0000	1.4
+++ CommonDataObject.java	17 Dec 2008 21:05:15 -0000	1.5
@@ -51,6 +51,7 @@
 
 import com.projity.pm.key.uniqueid.UniqueIdException;
 import com.projity.session.SessionFactory;
+import com.projity.util.Environment;
 
 /**
  *
@@ -116,7 +117,7 @@
         return isLocal(data.getUniqueId());
     }
     public static boolean isLocal(long uniqueId){
-        return uniqueId<MAX_LOCAL_ID;
+        return !Environment.isNoPodServer()&&uniqueId<MAX_LOCAL_ID;
     }
     public static void makeGlobal(DataObject data) throws UniqueIdException{
     	if (isLocal(data)) data.setUniqueId(SessionFactory.getInstance().getSession(false).getId());