felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1792455 - in /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal: runtime/ServletInfo.java whiteboard/WhiteboardManager.java
Date Mon, 24 Apr 2017 11:28:08 GMT
Author: cziegeler
Date: Mon Apr 24 11:28:07 2017
New Revision: 1792455

URL: http://svn.apache.org/viewvc?rev=1792455&view=rev
Log:
FELIX-5560 : Add change count property to runtime service

Modified:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java?rev=1792455&r1=1792454&r2=1792455&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
(original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
Mon Apr 24 11:28:07 2017
@@ -144,7 +144,7 @@ public class ServletInfo extends Whitebo
     @Override
     public boolean isValid()
     {
-        boolean valid = super.isValid() && !(isEmpty(this.patterns) && isEmpty(this.errorPage));
+        boolean valid = super.isValid() && !(isEmpty(this.patterns) && isEmpty(this.errorPage)
&& isEmpty(this.name));
         if ( valid )
         {
             if ( this.patterns != null )

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java?rev=1792455&r1=1792454&r2=1792455&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
(original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
Mon Apr 24 11:28:07 2017
@@ -606,6 +606,7 @@ public final class WhiteboardManager
                     {
                         this.failureStateHandler.addFailure(info, FAILURE_REASON_VALIDATION_FAILED);
                     }
+                    updateRuntimeChangeCount();
                     return true;
                 }
                 synchronized ( this.contextMap )
@@ -698,6 +699,7 @@ public final class WhiteboardManager
                             {
                                 iter.remove();
                                 this.preprocessorHandlers = newList;
+                                updateRuntimeChangeCount();
                                 return;
                             }
                         }



Mime
View raw message