cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [16/16] cayenne git commit: PR #155 - post merge compilation error
Date Wed, 14 Dec 2016 19:12:52 GMT
PR #155 - post merge compilation error


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

Branch: refs/heads/master
Commit: 25ae44a20023d8a756a161e5914b370e4b9763bf
Parents: badabfd
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Wed Dec 14 22:03:48 2016 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Wed Dec 14 22:08:32 2016 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/dbsync/merge/DbEntityDictionary.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/25ae44a2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java
index 82b6a61..6714cb0 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java
@@ -19,14 +19,14 @@
 
 package org.apache.cayenne.dbsync.merge;
 
-import java.util.Collection;
-import java.util.LinkedList;
-
 import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
 import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 
+import java.util.Collection;
+import java.util.LinkedList;
+
 class DbEntityDictionary extends MergerDictionary<DbEntity> {
 
     private final DataMap container;
@@ -57,7 +57,7 @@ class DbEntityDictionary extends MergerDictionary<DbEntity> {
         Collection<DbEntity> existingFiltered = new LinkedList<>();
         for (DbEntity entity : container.getDbEntities()) {
             TableFilter tableFilter = filtersConfig.tableFilter(entity.getCatalog(), entity.getSchema());
-            if (tableFilter != null && tableFilter.isIncludeTable(entity.getName())
!= null) {
+            if (tableFilter != null && tableFilter.isIncludeTable(entity.getName()))
{
                 existingFiltered.add(entity);
             }
         }


Mime
View raw message