svn commit: r1355623 - /rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/inject/SpringBindingModule.java

[mf...@apache.org]

Author: mfranklin
Date: Sat Jun 30 03:02:12 2012
New Revision: 1355623

URL: http://svn.apache.org/viewvc?rev=1355623&view=rev
Log:
Fixed null bean error (RAVE-713)

Modified:
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/inject/SpringBindingModule.java

Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/inject/SpringBindingModule.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/inject/SpringBindingModule.java?rev=1355623&r1=1355622&r2=1355623&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/inject/SpringBindingModule.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/inject/SpringBindingModule.java Sat Jun 30 03:02:12 2012
@@ -20,20 +20,15 @@
 package org.apache.rave.inject;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Provider;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.lang.reflect.Proxy;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 /**
  * Initializes a Spring application context and binds the beans from the context to Guice
@@ -56,7 +51,9 @@ public class SpringBindingModule extends
     private void bindFromApplicationContext() {
         for (String beanName : applicationContext.getBeanDefinitionNames()) {
             Object bean = applicationContext.getBean(beanName);
-            bindInterfaces(bean);
+            if(bean != null) {
+                bindInterfaces(bean);
+            }
         }
     }