You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/11/12 11:06:40 UTC
svn commit: r1034325 -
/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
Author: davsclaus
Date: Fri Nov 12 10:06:40 2010
New Revision: 1034325
URL: http://svn.apache.org/viewvc?rev=1034325&view=rev
Log:
CAMEL-3335: Fixed NPE in JpaConsumer.
Modified:
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java?rev=1034325&r1=1034324&r2=1034325&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java Fri Nov 12 10:06:40 2010
@@ -136,7 +136,6 @@ public class JpaConsumer extends Schedul
pendingExchanges = total - index - 1;
if (lockEntity(result, entityManager)) {
-
// process the current exchange
if (LOG.isDebugEnabled()) {
LOG.debug("Processing exchange: " + exchange);
@@ -146,7 +145,6 @@ public class JpaConsumer extends Schedul
} catch (Exception e) {
throw new PersistenceException(e);
}
-
getDeleteHandler().deleteObject(entityManager, result);
}
}
@@ -282,10 +280,8 @@ public class JpaConsumer extends Schedul
if (entityType == null) {
return null;
} else {
-
// Check if we have a property name on the @Entity annotation
String name = getEntityName(entityType);
-
if (name != null) {
return QueryBuilder.query("select x from " + name + " x");
} else {
@@ -297,16 +293,14 @@ public class JpaConsumer extends Schedul
}
protected String getEntityName(Class<?> clazz) {
-
Entity entity = clazz.getAnnotation(Entity.class);
-
+
// Check if the property name has been defined for Entity annotation
- if (!entity.name().equals("")) {
+ if (entity != null && !entity.name().equals("")) {
return entity.name();
} else {
return null;
}
-
}
protected DeleteHandler<Object> createDeleteHandler() {