Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Auge2019-03-04 23:16:14 -0500
committerRaymond Auge2019-03-05 16:50:21 -0500
commitfd5a393c8790001cf03e3101d4531128d80f81ff (patch)
tree096550b2afe1c8a9b15338d7b96bedd44312e377
parent38c9335ff0dfa501ec99b3ff7d2bf4bc3e67fc52 (diff)
downloadrt.equinox.bundles-fd5a393c8790001cf03e3101d4531128d80f81ff.tar.gz
rt.equinox.bundles-fd5a393c8790001cf03e3101d4531128d80f81ff.tar.xz
rt.equinox.bundles-fd5a393c8790001cf03e3101d4531128d80f81ff.zip
Bug 545084 - [http whiteboard] osgi.http.whiteboard.listener property not being handle properly
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/customizer/ContextListenerTrackerCustomizer.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/customizer/ContextListenerTrackerCustomizer.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/customizer/ContextListenerTrackerCustomizer.java
index 10ddadb9..ecc40fd5 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/customizer/ContextListenerTrackerCustomizer.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/customizer/ContextListenerTrackerCustomizer.java
@@ -65,18 +65,19 @@ public class ContextListenerTrackerCustomizer
httpServiceRuntime.removeFailedListenerDTO(serviceReference);
- String listener = (String)serviceReference.getProperty(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER);
+ Object listenerObj = serviceReference.getProperty(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER);
- if (Boolean.FALSE.toString().equalsIgnoreCase(listener)) {
- return result;
- }
-
- if (!Boolean.TRUE.toString().equalsIgnoreCase(listener)) {
+ if (!(listenerObj instanceof Boolean) && !(listenerObj instanceof String)) {
throw new HttpWhiteboardFailureException(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER + "=" + listener + " is not a valid option. Ignoring!", //$NON-NLS-1$ //$NON-NLS-2$
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER + "=" + listenerObj + " is not a valid option. Ignoring!", //$NON-NLS-1$ //$NON-NLS-2$
DTOConstants.FAILURE_REASON_VALIDATION_FAILED);
}
+ if (Boolean.FALSE.equals(listenerObj) || !Boolean.valueOf(String.valueOf(listenerObj)).booleanValue()) {
+ // Asks to be ignored.
+ return result;
+ }
+
result.set(contextController.addListenerRegistration(serviceReference));
}
catch (HttpWhiteboardFailureException hwfe) {

Back to the top