From 58a02e56f6f44ae754135503bde860bb02edcf83 Mon Sep 17 00:00:00 2001
From: krico <github@cwa.to>
Date: Tue, 23 Dec 2014 22:02:57 +0100
Subject: [PATCH 1/2] Two ModelRefs with key == null should be equal

---
 slim3/src/main/java/org/slim3/datastore/ModelRef.java     | 2 +-
 slim3/src/test/java/org/slim3/datastore/ModelRefTest.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/slim3/src/main/java/org/slim3/datastore/ModelRef.java b/slim3/src/main/java/org/slim3/datastore/ModelRef.java
index 219fa393..dcae2c4b 100644
--- a/slim3/src/main/java/org/slim3/datastore/ModelRef.java
+++ b/slim3/src/main/java/org/slim3/datastore/ModelRef.java
@@ -170,7 +170,7 @@ public boolean equals(Object obj) {
         }
         Key otherKey = ((ModelRef<?>) obj).getKey();
         if (key == null) {
-            return false;
+            return otherKey == null;
         }
         return key.equals(otherKey);
     }
diff --git a/slim3/src/test/java/org/slim3/datastore/ModelRefTest.java b/slim3/src/test/java/org/slim3/datastore/ModelRefTest.java
index 824343d1..cbc1664d 100644
--- a/slim3/src/test/java/org/slim3/datastore/ModelRefTest.java
+++ b/slim3/src/test/java/org/slim3/datastore/ModelRefTest.java
@@ -184,10 +184,13 @@ public void testEquals() throws Exception {
         Key key = Datastore.allocateId(Hoge.class);
         assertThat(ref.equals(ref), is(true));
         assertThat(ref.equals(null), is(false));
-        assertThat(ref.equals(other), is(false));
+        assertThat(ref.equals(other), is(true)); //Two ModelRefs with key==null should be equal
         ref.setKey(key);
+        assertThat(ref.equals(other), is(false));
+        assertThat(other.equals(ref), is(false));
         other.setKey(key);
         assertThat(ref.equals(other), is(true));
+        assertThat(other.equals(ref), is(true));
     }
 
     /**

From aba3b0d17e2220ba12e7a6d71e3d39147c88f514 Mon Sep 17 00:00:00 2001
From: krico <github@cwa.to>
Date: Sat, 4 Apr 2015 16:25:23 +0200
Subject: [PATCH 2/2] This is a temporary solution for krico/jas#222

---
 slim3-gen/pom.xml                                            | 2 +-
 .../java/org/slim3/gen/generator/ModelMetaGenerator.java     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/slim3-gen/pom.xml b/slim3-gen/pom.xml
index ac8196da..1c684e7a 100644
--- a/slim3-gen/pom.xml
+++ b/slim3-gen/pom.xml
@@ -9,7 +9,7 @@
   <!-- The Basics -->
   <groupId>org.slim3</groupId>
   <artifactId>slim3-gen</artifactId>
-  <version>1.0.16</version>
+  <version>1.0.16-jas</version>
   <packaging>jar</packaging>
 
   <!-- More Project Information -->
diff --git a/slim3-gen/src/main/java/org/slim3/gen/generator/ModelMetaGenerator.java b/slim3-gen/src/main/java/org/slim3/gen/generator/ModelMetaGenerator.java
index b3c85bec..a2f7e165 100644
--- a/slim3-gen/src/main/java/org/slim3/gen/generator/ModelMetaGenerator.java
+++ b/slim3-gen/src/main/java/org/slim3/gen/generator/ModelMetaGenerator.java
@@ -117,10 +117,9 @@ protected void printPackage(Printer printer) {
     protected void printClass(Printer printer) {
         printer
             .println(
-                "//@javax.annotation.Generated(value = { \"%s\", \"%s\" }, date = \"%tF %<tT\")",
+                "//@javax.annotation.Generated(value = { \"%s\", \"%s\" })",
                 ProductInfo.getName(),
-                ProductInfo.getVersion(),
-                new Date());
+                ProductInfo.getVersion());
         printer.println("/** */");
         printer.println(
             "public final class %s extends %s<%s> {",