cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [2/3] cayenne git commit: removing dependency on commons-lang
Date Fri, 30 Sep 2016 14:50:22 GMT
removing dependency on commons-lang


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

Branch: refs/heads/master
Commit: 041cb78f440248be5ecb982f60c76d431185897d
Parents: b809bb0
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Fri Sep 30 17:28:14 2016 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Fri Sep 30 17:45:50 2016 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/tools/dbimport/DbImportConfiguration.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/041cb78f/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
index e111d64..e45cdf9 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
@@ -250,7 +250,7 @@ public class DbImportConfiguration {
             // explicitly requested by the plugin caller, and the provided catalog is
             // not a pattern
             String catalog = catalogs[0].name;
-            if (defaultPackage != null && defaultPackage.length() > 0 &&
catalog.indexOf('%') < 0) {
+            if (catalog != null && catalog.length() > 0 && catalog.indexOf('%')
< 0) {
                 dataMap.setDefaultCatalog(catalog);
             }
 
@@ -258,7 +258,7 @@ public class DbImportConfiguration {
             // explicitly requested by the plugin caller, and the provided schema is
             // not a pattern
             String schema = catalogs[0].schemas[0].name;
-            if (defaultPackage != null && defaultPackage.length() > 0 &&
schema.indexOf('%') < 0) {
+            if (schema != null && schema.length() > 0 && schema.indexOf('%')
< 0) {
                 dataMap.setDefaultSchema(schema);
             }
         }


Mime
View raw message