Merge pull request #113 from lorenzleutgeb/patch-1
Avoid NPE in WindowContextImpl
diff --git a/.travis.yml b/.travis.yml
index 63ab5f9..0cd874f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
language: java
-sudo: false
dist: trusty
cache:
directories:
@@ -105,4 +104,4 @@
jdk: oraclejdk8
# Fails because it thinks an alternative is not a proper alternative?
- env: PROFILES=Weld2
- jdk: oraclejdk8
\ No newline at end of file
+ jdk: oraclejdk8
diff --git a/README.md b/README.md
index 410a0b7..f716c58 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,11 @@
Note that Apache DeltaSpike is **not** a CDI container itself, but a set of portable Extensions for it!
-Some of key features of Apache DeltaSpike include:
+Some of the key features of Apache DeltaSpike include:
- A core module that supports component configuration, type safe messaging and internationalization, and exception handling.
- A suite of utilities to make programmatic bean lookup easier.
-- A plugin for Java SE to bootstrap both JBoss Weld, Apache OpenWebBeans and other CDI containers outside of a a JavaEE server.
+- A plugin for Java SE to bootstrap both JBoss Weld, Apache OpenWebBeans and other CDI containers outside of a JavaEE server.
- JSF integration, including backporting of JSF 2.2 features for Java EE 6.
- JPA integration and transaction support.
- A Data module, to create an easy to use repository pattern on top of JPA.
@@ -40,4 +40,4 @@
- JDK 8
- Maven
-Just run `mvn clean install` from the top level directory, `deltaspike` to build the source code.
\ No newline at end of file
+Just run `mvn clean install` from the top level directory, `deltaspike` to build the source code.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java
index 39778a8..7eb509e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java
@@ -62,8 +62,11 @@
return false;
}
- return currentClass.getName().startsWith(currentClass.getSuperclass().getName()) &&
- currentClass.getName().contains("$$");
+ String name = currentClass.getName();
+ return name.startsWith(currentClass.getSuperclass().getName())
+ && (name.contains("$$") // CDI
+ || name.contains("_ClientProxy") //Quarkus
+ || name.contains("$HibernateProxy$")); // Hibernate
}
public static List<Class<?>> getProxyAndBaseTypes(Class<?> proxyClass)
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index d606aaa..2be85f5 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -73,7 +73,7 @@
<mojarra1.version>1.2_14</mojarra1.version>
<!-- used for some bytecode proxy stuff. Shaded in -->
- <asm.version>8.0.1</asm.version>
+ <asm.version>9.0</asm.version>
<!-- Geronimo specs -->
<geronimo-annotation_1.2_spec.version>1.0</geronimo-annotation_1.2_spec.version>
