#5127 transaction listener must not be null

svn changeset:13514/svn branch:6.3

diff --git a/src/com/vaadin/service/ApplicationContext.java b/src/com/vaadin/service/ApplicationContext.java
index 244e3d1bdfbff1ad54931aa7ef8f0c6a7497762f..76685cc215072b6efc39c04ae054515783815452 100644 (file)
--- a/src/com/vaadin/service/ApplicationContext.java
+++ b/src/com/vaadin/service/ApplicationContext.java
@@ -54,6 +54,7 @@ public interface ApplicationContext extends Serializable {
      * called before and after each each request related to this session except
      * when serving static resources.
      * 
+     * The transaction listener must not be null.
      * 
      * @see com.vaadin.service.ApplicationContext#addTransactionListener(com.vaadin.service.ApplicationContext.TransactionListener)
      */

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
index bcac87e6ad25b8895f2863a8f3cdbf1ced941c8f..92488ef9ca6e67ef0c8e4cb9a3910d00f1c603fb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
@@ -3,22 +3,22 @@
  */
 package com.vaadin.terminal.gwt.server;\r
 \r
-import java.io.PrintWriter;\r
-import java.io.Serializable;\r
-import java.io.StringWriter;\r
-import java.net.URL;\r
-import java.util.Collection;\r
-import java.util.Collections;\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
-import java.util.LinkedList;\r
-\r
-import javax.servlet.http.HttpSessionBindingEvent;\r
-import javax.servlet.http.HttpSessionBindingListener;\r
-\r
-import com.vaadin.Application;\r
-import com.vaadin.service.ApplicationContext;\r
-import com.vaadin.terminal.ApplicationResource;\r
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
+import com.vaadin.Application;
+import com.vaadin.service.ApplicationContext;
+import com.vaadin.terminal.ApplicationResource;
 \r
 /**\r
  * Base class for web application contexts (including portlet contexts) that\r
@@ -36,8 +36,10 @@ public abstract class AbstractWebApplicationContext implements
 \r
     protected HashMap<Application, AbstractCommunicationManager> applicationToAjaxAppMgrMap = new HashMap<Application, AbstractCommunicationManager>();\r
 \r
-    public void addTransactionListener(TransactionListener listener) {\r
-        listeners.add(listener);\r
+    public void addTransactionListener(TransactionListener listener) {
+        if (listener != null) {
+            listeners.add(listener);
+        }\r
     }\r
 \r
     public void removeTransactionListener(TransactionListener listener) {\r