You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/11 07:59:41 UTC
[isis] 01/01: ISIS-2502: potential NPE in AopPatch
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-2502-ex.recog
in repository https://gitbox.apache.org/repos/asf/isis.git
commit db6793341c39db0d518ae30fc08f5e30fa1cc24e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 11 08:59:25 2021 +0100
ISIS-2502: potential NPE in AopPatch
---
.../main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java | 2 +-
.../jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java b/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java
index 5f4a098..f030fea 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java
@@ -84,7 +84,7 @@ public class AopPatch implements ApplicationContextAware {
// -- HELPER
private TransactionInterceptor patchedTransactionInterceptor(
- final @NonNull TransactionAttributeSource transactionAttributeSource,
+ final @Nullable TransactionAttributeSource transactionAttributeSource,
final @Nullable TransactionInterceptorFactory transactionInterceptorFactory,
final @NonNull TransactionManager txManager) {
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 4baf5a4..fb64837 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -34,7 +34,6 @@ import org.apache.isis.applib.query.AllInstancesQuery;
import org.apache.isis.applib.query.NamedQuery;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.exceprecog.Category;
-import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerService;
import org.apache.isis.applib.services.repository.EntityState;
import org.apache.isis.applib.services.xactn.TransactionService;