catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.persistence.fragment/.project b/org.eclipse.osbp.persistence.fragment/.project
index 8f537a8..4499677 100644
--- a/org.eclipse.osbp.persistence.fragment/.project
+++ b/org.eclipse.osbp.persistence.fragment/.project
@@ -36,12 +36,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/org.eclipse.osbp.persistence.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.persistence.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.persistence.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.persistence.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
eclipse.preferences.version=1
is_project_specific=true
outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
diff --git a/org.eclipse.osbp.persistence.fragment/META-INF/MANIFEST.MF b/org.eclipse.osbp.persistence.fragment/META-INF/MANIFEST.MF
index 53bd912..0fc0555 100644
--- a/org.eclipse.osbp.persistence.fragment/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.persistence.fragment/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@
Require-Bundle: org.eclipse.persistence.jpa,
org.eclipse.osbp.core.api;bundle-version="0.9.0",
org.slf4j.api
-Fragment-Host: org.eclipse.persistence.jpa
+Fragment-Host: org.eclipse.persistence.jpa;bundle-version="2.6.1.v20150916-55dc7c3"
Export-Package: org.eclipse.osbp.persistence.fragment
diff --git a/org.eclipse.osbp.persistence.fragment/src/org/eclipse/osbp/persistence/fragment/PersistenceExceptionHandler.java b/org.eclipse.osbp.persistence.fragment/src/org/eclipse/osbp/persistence/fragment/PersistenceExceptionHandler.java
index 6b393c4..ba5e1a4 100644
--- a/org.eclipse.osbp.persistence.fragment/src/org/eclipse/osbp/persistence/fragment/PersistenceExceptionHandler.java
+++ b/org.eclipse.osbp.persistence.fragment/src/org/eclipse/osbp/persistence/fragment/PersistenceExceptionHandler.java
@@ -5,7 +5,9 @@
import org.eclipse.osbp.core.api.persistence.IPersistenceException;
import org.eclipse.osbp.core.api.persistence.PersistenceExceptionEvent;
+import org.eclipse.persistence.exceptions.DatabaseException;
import org.eclipse.persistence.exceptions.ExceptionHandler;
+import org.eclipse.persistence.queries.SQLCall;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,6 +19,16 @@
@Override
public Object handleException(RuntimeException exception) {
log.debug("{}", exception);
+ // in case of a
+ if(exception instanceof DatabaseException) {
+ if(((DatabaseException)exception).getCall() instanceof SQLCall) {
+ SQLCall call = (SQLCall)((DatabaseException)exception).getCall();
+ if(call.getQueryString().toUpperCase().startsWith("CREATE TABLE")) {
+ return null;
+ }
+ }
+
+ }
String message = exception.getMessage();
if(exception.getCause() != null) {
message = exception.getCause().getMessage();
