You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/04/24 15:18:42 UTC
svn commit: r1792489 - in
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal:
runtime/dto/FailedDTOHolder.java whiteboard/WhiteboardManager.java
Author: cziegeler
Date: Mon Apr 24 15:18:42 2017
New Revision: 1792489
URL: http://svn.apache.org/viewvc?rev=1792489&view=rev
Log:
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.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/dto/FailedDTOHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java?rev=1792489&r1=1792488&r2=1792489&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java Mon Apr 24 15:18:42 2017
@@ -77,13 +77,18 @@ public final class FailedDTOHolder
this.failedErrorPageDTOs.add(dto);
}
- if ( ((ServletInfo) info).getPatterns() != null || !isError )
+ if ( ((ServletInfo) info).getPatterns() != null || ((ServletInfo)info).getName() != null || !isError )
{
final FailedServletDTO dto = (FailedServletDTO)ServletDTOBuilder.build((ServletInfo) info, failureCode);
if ( ((ServletInfo) info).getPatterns() != null )
{
dto.patterns = ((ServletInfo) info).getPatterns();
+ }
+ else
+ {
+ dto.patterns = BuilderConstants.EMPTY_STRING_ARRAY;
}
+ dto.name = ((ServletInfo)info).getName();
dto.servletContextId = contextId;
this.failedServletDTOs.add(dto);
}
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=1792489&r1=1792488&r2=1792489&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 15:18:42 2017
@@ -664,14 +664,34 @@ public final class WhiteboardManager
private int checkForServletRegistrationInHttpServiceContext(final WhiteboardContextHandler h,
final WhiteboardServiceInfo<?> info)
{
- if ( info instanceof ServletInfo || info instanceof ResourceInfo )
+ if ( h.getContextInfo().getServiceId() == HttpServiceFactory.HTTP_SERVICE_CONTEXT_SERVICE_ID )
{
- if ( h.getContextInfo().getServiceId() == HttpServiceFactory.HTTP_SERVICE_CONTEXT_SERVICE_ID )
- {
+ if ( info instanceof ResourceInfo )
+ {
this.failureStateHandler.addFailure(info, HttpServiceFactory.HTTP_SERVICE_CONTEXT_SERVICE_ID, DTOConstants.FAILURE_REASON_VALIDATION_FAILED);
return DTOConstants.FAILURE_REASON_VALIDATION_FAILED;
}
+ else if ( info instanceof ServletInfo )
+ {
+ final ServletInfo servletInfo = (ServletInfo)info;
+ final boolean nameIsEmpty = servletInfo.getName() == null || servletInfo.getName().isEmpty();
+ final boolean errorPageIsEmpty = servletInfo.getErrorPage() == null || servletInfo.getErrorPage().length == 0;
+ final boolean patternIsEmpty = servletInfo.getPatterns() == null || servletInfo.getPatterns().length == 0;
+ if ( !nameIsEmpty || !errorPageIsEmpty )
+ {
+ if ( patternIsEmpty )
+ {
+ // no pattern, so this is valid
+ return -1;
+ }
+ }
+
+ // pattern is invalid, regardless of the other values
+ this.failureStateHandler.addFailure(info, HttpServiceFactory.HTTP_SERVICE_CONTEXT_SERVICE_ID, DTOConstants.FAILURE_REASON_VALIDATION_FAILED);
+
+ return DTOConstants.FAILURE_REASON_VALIDATION_FAILED;
+ }
}
return -1;