Skip to content

Commit

Permalink
Merge pull request #255 from hm1rafael/fix-null-spring-beans
Browse files Browse the repository at this point in the history 
Adds check to ```ProxyReplacer``` for null beans
  • Loading branch information
@skybber
skybber authored Jul 17, 2018
2 parents 04ac140 + 669bf93 commit e4b6203
Show file tree
Hide file tree
Showing 35 changed files with 37 additions and 34 deletions.
2 changes: 1 addition & 1 deletion hotswap-agent-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion hotswap-agent-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<packaging>pom</packaging>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>

<name>HotswapAgent</name>
<description>Java unlimited runtime class and resource redefinition.</description>
Expand Down
2 changes: 1 addition & 1 deletion hotswap-agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-cdi-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-deltaspike-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-el-resolver-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-glassfish-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-hibernate-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-hibernate3-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-jbossmodules-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-jersey1-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-jersey2-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-jetty-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-log4j2-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-logback-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-mojarra-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-myfaces-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-omnifaces-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-osgiequinox-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-owb-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-proxy-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-resteasy-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-resteasy-registry-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-seam-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
Empty file modified plugin/hotswap-agent-spring-plugin/run-tests.sh
100644 → 100755
View file
Empty file.
3 changes: 3 additions & 0 deletions ...nt-spring-plugin/src/main/java/org/hotswap/agent/plugin/spring/getbean/ProxyReplacer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public static void clearAllProxies() {
* @return Proxied bean
*/
public static Object register(Object beanFactry, Object bean, Class<?>[] paramClasses, Object[] paramValues) {
if (bean == null) {
return bean;
}
if (SpringPlugin.basePackagePrefixes != null) {
boolean hasMatch = false;
for (String basePackagePrefix : SpringPlugin.basePackagePrefixes) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-tomcat-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions plugin/hotswap-agent-tutorial-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.hotswap.plugin.examples</groupId>
<artifactId>hotswap-agent-tutorial-plugin</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>

<dependencies>
<dependency>
Expand All @@ -32,4 +32,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-vaadin-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-webobjects-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-weld-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-wildfly-el-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugin/hotswap-agent-zk-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-parent</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<relativePath>../../hotswap-agent-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.hotswapagent</groupId>
<artifactId>hotswap-agent-aggregator</artifactId>
<version>1.3.0</version>
<version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Hotswap Agent Aggregator</name>
Expand Down

0 comments on commit e4b6203

Please sign in to comment.