From 9b10d38e41150fdbd4120e1058a34c5b986dd849 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 28 May 2012 00:12:47 +0200 Subject: [PATCH] Fix window state comparison in DAHandlerMapping --- .../mvc/annotation/DefaultAnnotationHandlerMapping.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index 9aec51689b6..2f25cb1967c 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -411,8 +411,8 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } else if (other instanceof RenderMappingPredicate) { RenderMappingPredicate otherRender = (RenderMappingPredicate) other; - boolean hasWindowState = "".equals(this.windowState); - boolean otherHasWindowState = "".equals(otherRender.windowState); + boolean hasWindowState = (this.windowState != null); + boolean otherHasWindowState = (otherRender.windowState != null); if (hasWindowState != otherHasWindowState) { return (hasWindowState ? -1 : 1); }