commit 14cbf30dcc28af1573f3779c685a595e9aa41a0e
author Paul Merlin <paulmerlin@apache.org> Mon Jul 27 16:22:07 2015 +0200
committer Paul Merlin <paulmerlin@apache.org> Mon Jul 27 17:09:02 2015 +0200
tree 5a09d1f3c0da2366142931d8c1b4e0e22d7fdf93
parent 965c7694285daa1fab346bd73298419e3f3af09f

ZEST-107 Fix JSONEntityState clone logic

The cloneStateIfGlobalStateLoaded() method of JSONEntityState is called
before any change is made to the entity state.

This method starts with the following check:

if( isStateNotCloned() )
{
    return;
}
// Do the clone

And the (private) isStateNotCloned() method returns:
status == EntityStatus.LOADED

IOW, the code says that it will clone state if status is loaded,
but does the opposite!

Rewriting the cloneStateIfGlobalStateLoaded() method,
as Tibor suggested, fixes the issue:

if( status != EntityState.LOADED )
{
    return;
}
// Do the clone

I removed the isStateNotCloned() method BTW as it was not used elsewhere
and the code is simpler without it.

core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONEntityState.java

diff --git a/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONEntityState.java b/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONEntityState.java
index 435acde..ae60809 100644
--- a/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONEntityState.java
+++ b/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONEntityState.java
@@ -308,14 +308,9 @@
         }
     }
 
-    boolean isStateNotCloned()
-    {
-        return status == EntityStatus.LOADED;
-    }
-
     void cloneStateIfGlobalStateLoaded()
     {
-        if( isStateNotCloned() )
+        if( status != EntityStatus.LOADED )
         {
             return;
         }