Extend taxisUnpack to override checking of ID restoration.

src/resource_unpack.c

@@ -54,7 +54,7 @@ void reshUnpackResources(char * unpackBuffer, int unpackBufferSize,
 	  break;
 	case TAXIS:
 	  taxisUnpack(unpackBuffer, unpackBufferSize, &unpackBufferPos,
-                      nspTarget, context);
+                      nspTarget, context, 1);
 	  break;
 	case INSTITUTE:
           instituteUnpack(unpackBuffer, unpackBufferSize, &unpackBufferPos,

src/taxis.c

@@ -1317,7 +1317,7 @@ taxisGetPackSize(void *p, void *context)
 
 int
 taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
-            int nspTarget, void *context)
+            int nspTarget, void *context, int checkForSameID)
 {
   taxis_t * taxisP;
   int intBuffer[taxisNint];
@@ -1335,7 +1335,8 @@ taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
   taxisP = taxisNewEntry();
   if ( ! taxisP ) Error("No memory");
 
-  xassert(namespaceAdaptKey(intBuffer[0], nspTarget) == taxisP->self);
+  xassert(!checkForSameID
+          || namespaceAdaptKey(intBuffer[0], nspTarget) == taxisP->self);
 
   taxisP->used       = intBuffer[1];
   taxisP->type       = intBuffer[2];

src/taxis.h

@@ -35,7 +35,7 @@ double  vtime2timeval(int vdate, int vtime, taxis_t *taxis);
 
 int
 taxisUnpack(char * unpackBuffer, int unpackBufferSize, int * unpackBufferPos,
-            int nspTarget, void *context);
+            int nspTarget, void *context, int checkForSameID);
 
 #endif  /* _TAXIS_H */
 /*