You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/06/20 11:10:48 UTC
[myfaces] branch master updated: fixed possible NPE
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new ca86c8d fixed possible NPE
ca86c8d is described below
commit ca86c8d5fde765c78824bb70441eb065bc11b433
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Thu Jun 20 13:10:42 2019 +0200
fixed possible NPE
---
.../org/apache/myfaces/context/servlet/ServletExternalContextImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
index f8dd6af..23df782 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
@@ -458,7 +458,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
FacesContext facesContext = getCurrentFacesContext();
Integer port = MyfacesConfig.getCurrentInstance(facesContext).getWebsocketEndpointPort();
- port = (port == 0) ? null : port;
+ port = (port == null || port == 0) ? null : port;
if (port != null && !port.equals(facesContext.getExternalContext().getRequestServerPort()))
{
String scheme = facesContext.getExternalContext().getRequestScheme();