From d45a7211fbd9fd437f32099cbc5c9268fe5a3fa9 Mon Sep 17 00:00:00 2001 From: "Ying-Lian.Shi" Date: Thu, 22 Oct 2015 16:38:13 +0000 Subject: [PATCH 1/3] ASM #17873 renive qyites from default SVCBU_USER_ID Change-Id: Ifb6894723b734b53fd4217268db50b45d5f2f427 Former-commit-id: d007b5a98a0fc4fdd6063c3c6dc5285eef661de5 --- .../base/config/gfe/svcbu.properties | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/svcbu.properties b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/svcbu.properties index b0319c495f..a1654ba62f 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/svcbu.properties +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/svcbu.properties @@ -1,3 +1,14 @@ +# ---------------------------------------------------------------------------- +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 10/22/2015 DR #17873 lshi remove quotes from default +# SVCBU_USER_ID +# +################################################################# + #Variables used by service backup: # @@ -124,6 +135,10 @@ SVCBU_GRIDAREA=ISC_Send_Area SVCBU_ADDRESSEE="ANCF,BNCF" SVCBU_WMO_HEADER=SVCBKPIFP SVCBU_USER=0 -SVCBU_USER_ID="" + +# Do not use quotes when setting SVCBU_USER_ID +# Example syntax: SVCBU_USER_ID=backuser +SVCBU_USER_ID= + EXPORT_GRID=1 PRIMARY_SITES= From d142e9082ecf5cdaff200bf308d9b64840fb9723 Mon Sep 17 00:00:00 2001 From: "Ying-Lian.Shi" Date: Mon, 26 Oct 2015 16:18:10 +0000 Subject: [PATCH 2/3] ASM #18244 NullPointerException in GFE when run the Formatter against the Fcst Change-Id: Ide285a777dcbbe9cca1229a52ada0bee2755a69a Former-commit-id: 9966a04af5084e190ace47dfd1f135eec923cd4f --- .../formatterlauncher/ProductEditorComp.java | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java index 95e380221f..68c44cd2ca 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java @@ -173,6 +173,7 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations; * 08/06/2015 13753 lshi removed updateTime flag, undo the change of updateIssueExpireTimes, etc. * 08/10/2015 4721 randerso Changed getNNNid() to use the productID field (not textdbPil) * 09/15/2015 4858 dgilling Disable store/transmit in DRT mode. + * 10/26/2015 18244 lshi fixed NullPointerException (pds, updateIssueExpireTimes) * * * @author lvenable @@ -380,7 +381,6 @@ public class ProductEditorComp extends Composite implements private final Listener visibilityListener; - /** * Enumeration of product types. * @@ -1954,7 +1954,7 @@ public class ProductEditorComp extends Composite implements this.expireDate = cal.getTime(); dateTimeLbl.setText(expireLabelFmt.format(expireDate)); - if (!dead) { //&& !editorCorrectionMode) { // && !spellDialog) { + if (!dead) { changeTimes(); } } @@ -1977,25 +1977,22 @@ public class ProductEditorComp extends Composite implements try { textComp.startUpdate(); ProductDataStruct pds = textComp.getProductDataStruct(); - if (!textComp.isCorMode()) { - if (pds != null) { + if (pds != null) { + if (!textComp.isCorMode()) { TextIndexPoints pit = pds.getPIT(); if (pit != null) { String time = purgeTimeFmt.format(now); textComp.replaceText(pit, time); } } - } - - // Update MND time - TextIndexPoints tip = pds.getMndMap().get("nwstime"); - if (tip != null) { - SimpleDateFormat fmt = new SimpleDateFormat( - longLocalFmtStr); - fmt.setTimeZone(localTimeZone); - String issueTime = fmt.format(now).toUpperCase(); + // Update MND time + TextIndexPoints tip = pds.getMndMap().get("nwstime"); if (tip != null) { + SimpleDateFormat fmt = new SimpleDateFormat( + longLocalFmtStr); + fmt.setTimeZone(localTimeZone); + String issueTime = fmt.format(now).toUpperCase(); textComp.replaceText(tip, issueTime); } } @@ -2022,7 +2019,6 @@ public class ProductEditorComp extends Composite implements fmt.setTimeZone(localTimeZone); String officeIssueTime = fmt.format(now).toUpperCase(); - for (int i = 0; i < numSegments; i++) { textComp.startUpdate(); HashMap segMap = pds From c22c1f271d375de1f811a88f046b808a8ac93244 Mon Sep 17 00:00:00 2001 From: "Shawn.Hooper" Date: Tue, 27 Oct 2015 16:39:20 -0400 Subject: [PATCH 3/3] ASM #17446 - Update Init.py with merged fix from 15.1.2 Change-Id: I10ba21c54c164adc9c3fd2c5993650a4bbd09409 Former-commit-id: 328638d10764c1db49496c999ffe197b86fee43c --- .../utility/edex_static/base/smartinit/Init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py index 71b80760d4..3d877b7d0b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py @@ -1064,7 +1064,7 @@ class Forecaster(GridUtilities): try: rval = apply(mthd, tuple(gargs)) - if type(rval) is not ndarray: + if type(rval) is not ndarray and rval is not None: if type(rval) is not tuple: jrval = rval rval = rval.getNDArray()