[jboss-cvs] JBossAS SVN: r87515 - branches/Branch_5_x/cluster/src/main/org/jboss/profileservice/cluster/repository.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-04-17 14:43:09 -0400 (Fri, 17 Apr 2009)
New Revision: 87515

Modified:
   branches/Branch_5_x/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultSynchronizationPolicy.java
Log:
[JBAS-5552] Avoid NPE when sender discrepancy is unknown

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultSynchronizationPolicy.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultSynchronizationPolicy.java	2009-04-17 18:29:31 UTC (rev 87514)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultSynchronizationPolicy.java	2009-04-17 18:43:09 UTC (rev 87515)
@@ -128,6 +128,11 @@
    private static boolean isChangeMoreRecent(RepositoryItemMetadata toChange, RepositoryItemMetadata current,
          TimestampDiscrepancy senderTimestampDiscrepancy, TimestampDiscrepancy currentTimestampDiscrepancy, boolean equalAllowed)
    {
+      if (senderTimestampDiscrepancy == null)
+      {
+         // Just have to hope for the best
+         senderTimestampDiscrepancy = TimestampDiscrepancy.NO_DISCREPANCY;
+      }
       if (currentTimestampDiscrepancy == null)
       {
          // Just have to hope for the best