Index: BeanContextSupport.java =================================================================== --- BeanContextSupport.java (revision 479610) +++ BeanContextSupport.java (working copy) @@ -250,33 +250,7 @@ } public boolean addAll(Collection c) { - - Collection col = new ArrayList(); - - // Add children one by one - for (Iterator i = c.iterator(); i.hasNext();) { - try { - Object next = i.next(); - - if (add(next)) { - col.add(next); - } - } catch (Exception e) { - - // Roll back changes but first check if it's already rolling - // back to avoid infinitive action - if (!this.rollingBack) { - this.rollingBack = true; - removeAll(col); - } else { - this.rollingBack = false; - } - - return false; - } - } - - return true; + throw new UnsupportedOperationException(); } public void addBeanContextMembershipListener( @@ -775,9 +749,13 @@ public void propertyChange(PropertyChangeEvent pce) { - if (!pce.getPropertyName().equals(BEAN_CONTEXT)) { + + if (pce == null || pce.getPropertyName() == null || + !pce.getPropertyName().equals(BEAN_CONTEXT)) { + return; } + Object source = pce.getSource();