You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2017/02/13 04:52:24 UTC

[3/3] cayenne git commit: CAY-2226 PK generation for Frontbase: PK cache size must be ignored

CAY-2226 PK generation for Frontbase: PK cache size must be ignored

* after PR #173...


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/814de654
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/814de654
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/814de654

Branch: refs/heads/STABLE-3.1
Commit: 814de6546f03e5276d2d100b4c79fe2d4062d5f6
Parents: 48aafa7
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Mon Feb 13 07:51:54 2017 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Mon Feb 13 07:52:00 2017 +0300

----------------------------------------------------------------------
 docs/doc/src/main/resources/RELEASE-NOTES.txt           |  1 +
 .../cayenne/dba/frontbase/FrontBasePkGenerator.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/814de654/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index a7113a5..37c6509 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@ Bug Fixes Since 3.1.1:
 
 CAY-2084 ObjectIdQuery - no cache access polymorphism
 CAY-2101 DataContext.currentSnapshot() doesn't set snapshot entity name
+CAY-2226 PK generation for Frontbase: PK cache size must be ignored
 
 ----------------------------------
 Release: 3.1.1

http://git-wip-us.apache.org/repos/asf/cayenne/blob/814de654/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
----------------------------------------------------------------------
diff --git a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
index 1547626..863fb05 100644
--- a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
+++ b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
@@ -19,11 +19,6 @@
 
 package org.apache.cayenne.dba.frontbase;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.QueryResult;
@@ -33,6 +28,11 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLTemplate;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @since 1.2
  */
@@ -43,7 +43,7 @@ public class FrontBasePkGenerator extends JdbcPkGenerator {
     }
 
     /**
-     * Retruns zero as PK caching is not supported by FrontBaseAdapter.
+     * Returns zero as PK caching is not supported by FrontBaseAdapter.
      */
     @Override
     public int getPkCacheSize() {