From 2550de810237ad259725ec810afb827adcedb148 Mon Sep 17 00:00:00 2001 From: Michael Ranaldo Date: Thu, 25 May 2017 13:50:52 +0100 Subject: [PATCH 1/3] PAYARA-1564 Corrected error where missing else meant war files with ejbs would evaluate as ejbs --- .../admingui/common/handlers/ApplicationHandlers.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java index cb0881f45df..7667069b67c 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java @@ -735,12 +735,13 @@ public static void getApplicationType(HandlerContext handlerCtx) { String appType = "other"; if (! GuiUtil.isEmpty(snifferMap.get("web"))){ appType="war"; - }if (! GuiUtil.isEmpty(snifferMap.get("ejb"))){ + } else + if (! GuiUtil.isEmpty(snifferMap.get("ejb"))){ appType="ejb"; - }else + } else if (! GuiUtil.isEmpty(snifferMap.get("connector"))){ appType="rar"; - }else + } else if (! GuiUtil.isEmpty(snifferMap.get("appclient"))){ appType="appclient"; } From 81a28347e1f8eda64bad8a067cdfaffa30f5015c Mon Sep 17 00:00:00 2001 From: Michael Ranaldo Date: Thu, 25 May 2017 13:55:54 +0100 Subject: [PATCH 2/3] PAYARA-1564 Updated license headers --- .../glassfish/admingui/common/handlers/ApplicationHandlers.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java index 7667069b67c..b2646441b0f 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java @@ -38,7 +38,7 @@ * holder. */ -// Portions Copyright [2016] [Payara Foundation and/or its affiliates]] +// Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates]] /* * ApplicationHandlers.java From 4773a4b933986aefd45f0f3b3ad0163a03b6d2ea Mon Sep 17 00:00:00 2001 From: Michael Ranaldo Date: Thu, 25 May 2017 13:56:26 +0100 Subject: [PATCH 3/3] PAYARA-1564 Removed errant ] from license header --- .../glassfish/admingui/common/handlers/ApplicationHandlers.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java index b2646441b0f..dc514ad87c1 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java @@ -38,7 +38,7 @@ * holder. */ -// Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates]] +// Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] /* * ApplicationHandlers.java