Stephen Gilbert
90917307fb
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 1af8bfa176
[formerly 64c2460028
[formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]
Former-commit-id: 64c2460028
Former-commit-id: 312a09983a
2014-01-27 14:23:02 -05:00
Stephen Gilbert
ef9b4279bc
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: bf7fcc1952
[formerly a70450b064
[formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]
Former-commit-id: a70450b064
Former-commit-id: a7ce764b19
2014-01-27 14:22:17 -05:00
Stephen Gilbert
7383aa8502
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: b64adbed81
[formerly 6785474b17
[formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]
Former-commit-id: 6785474b17
Former-commit-id: 53fa8822e0
2014-01-27 14:20:47 -05:00
Stephen Gilbert
01f013e2d0
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Many changes in NCEP Viz plugins for 14.2.1 enhancements and big fixes
for the National Centers Perspective and PGEN
Change-Id: I4fa707cf0844800a4c77961e110338daafbb0354
Former-commit-id: 369d2592fe
[formerly 14d218ddc5
[formerly e3a35c9c3eb2184818b21ba1b23aac988a0148ee]]
Former-commit-id: 14d218ddc5
Former-commit-id: e1d16e1aeb
2014-01-24 10:46:37 -05:00
Stephen Gilbert
688690ea97
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Updates to configuration files used by the National Centers Perspective
Change-Id: Ie2c8c4f8d0eb57031fb25acbe450b6e3ac56c109
Former-commit-id: 10a718853d
[formerly 95bbc2f2b2
[formerly 12d9868db2939c53ed49b1cf3092f7d638189696]]
Former-commit-id: 95bbc2f2b2
Former-commit-id: 4b28ca1baf
2014-01-24 10:33:14 -05:00
Stephen Gilbert
e64020e271
VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1
...
Updates to GRIB decoder tables.
Changes to some decoder plugins to support data ingest through qpid.
Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0
Former-commit-id: 2bd1588ad4
[formerly a12b83ddfb
[formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]]
Former-commit-id: a12b83ddfb
Former-commit-id: 185f06495f
2014-01-24 10:14:17 -05:00
Stephen Gilbert
ca2016cb72
Merge "VLab Issue #2841 - SWPC delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: bae1844e81
[formerly b9eefb97b4
[formerly 015664232a6214feb624262196e45aadc8ee4636]]
Former-commit-id: b9eefb97b4
Former-commit-id: e49e5d406f
2014-01-23 17:12:28 -05:00
Stephen Gilbert
f841786213
VLab Issue #2841 - SWPC delivery for 14.2.1
...
Contains functionality for image calculations such
as differencing and ratios.
Also includes config files for displaying SWPC gridded terrestrial data.
Amending commit to address code-review concerns with some java classes.
Change-Id: I3e6e8dbd5015ef825386c1203c333091c6a24f25
Former-commit-id: f0f1a832c7
[formerly e02136a026
[formerly 5823fba56ae3036682814548004afd076174bb06]]
Former-commit-id: e02136a026
Former-commit-id: 90a5cf53d3
2014-01-23 11:58:55 -05:00
Ron Anderson
2e8cbade9f
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 62c445d872
[formerly ba7a25a88f
[formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: ba7a25a88f
Former-commit-id: 0bde38cef3
2014-01-13 17:45:20 -06:00
Steve Harris
c6cb11a5f4
14.1.1-15 baseline
...
Former-commit-id: d8e5799328
[formerly 8bbd803ace
[formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]
Former-commit-id: 8bbd803ace
Former-commit-id: f88ff2bde9
2014-01-06 14:08:08 -05:00
Steve Harris
94a748fa8d
14.1.1-14 baseline
...
Former-commit-id: 9ef1c841b9
[formerly f2ad9da4eb
[formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: f2ad9da4eb
Former-commit-id: 6df7c67f95
2014-01-06 14:02:30 -05:00
Richard Peter
cc89b16338
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: 2e7fd9ddba
[formerly 1de516964b
[formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]
Former-commit-id: 1de516964b
Former-commit-id: e4f59ea119
2013-12-17 21:04:53 -06:00
Nate Jensen
72621bcf14
Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
...
Former-commit-id: 84e3cf0988
[formerly 66f5000243
[formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]
Former-commit-id: 66f5000243
Former-commit-id: 29425906ba
2013-12-17 12:20:37 -06:00
Brad Gonzales
8e26f2a99c
Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
...
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods. Wrapped debug logging in is debug on checks.
Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90
Former-commit-id: b2b352a5ae
[formerly cc75442fa3
[formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]
Former-commit-id: cc75442fa3
Former-commit-id: 253cc9df80
2013-12-17 11:57:06 -06:00
Richard Peter
3c206aecd2
Merge "Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo." into omaha_14.2.1
...
Former-commit-id: 253aab3dde
[formerly d233a5161a
[formerly adb1a2efc0e5d0389047b79e2bbb95de16f69a0c]]
Former-commit-id: d233a5161a
Former-commit-id: 123fa3a850
2013-12-17 11:00:44 -06:00
Brad Gonzales
b4b51de862
Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
...
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168
Former-commit-id: d0ae47d053
[formerly d324400d65
[formerly f4c1739687685a22847a09490724e84825032146]]
Former-commit-id: d324400d65
Former-commit-id: d329fc26bb
2013-12-17 09:43:12 -06:00
Mike Duff
c5dbf9536d
Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
...
Former-commit-id: 6406bcdd05
[formerly 66f5585774
[formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]
Former-commit-id: 66f5585774
Former-commit-id: e26bea423e
2013-12-17 09:41:30 -06:00
Greg Armendariz
7219a81337
Issue #2182 - Change release number
...
Former-commit-id: e994e19877
[formerly 85703b9919
[formerly f9b49df162e36376f96897db77e0504cba87f28a]]
Former-commit-id: 85703b9919
Former-commit-id: 00fd9a7bc5
2013-12-17 08:46:15 -06:00
Bryan Kowal
b2550c873b
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
...
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: 120ebd045a
[formerly 43008f4698
[formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]
Former-commit-id: 43008f4698
Former-commit-id: 0c3b22c8f2
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
89de68386a
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
...
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: cc5d9edc92
[formerly 7e5349bbff
[formerly 33033c354a783ab58d89599eb78355c6b354594f]]
Former-commit-id: 7e5349bbff
Former-commit-id: fb1480b30d
2013-12-16 14:31:44 -06:00
Richard Peter
66adb4939a
Merge "Issue #2170 : Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
...
Former-commit-id: 84b64dac81
[formerly 3758a9532c
[formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]
Former-commit-id: 3758a9532c
Former-commit-id: 42d277364b
2013-12-16 13:43:37 -06:00
Richard Peter
38d9d2fc40
Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
...
Former-commit-id: 624c51e393
[formerly 35299e917d
[formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]
Former-commit-id: 35299e917d
Former-commit-id: 8b18800b95
2013-12-13 16:09:13 -06:00
Mike Duff
4a34562b6d
Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
...
Former-commit-id: eb591030d8
[formerly b310cf0388
[formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]
Former-commit-id: b310cf0388
Former-commit-id: 685c07cde0
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
c793973916
Issue #2613 Replication subscription start time correctly set
...
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5
Former-commit-id: e0d32db91c
[formerly 70e6212353
[formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]
Former-commit-id: 70e6212353
Former-commit-id: dd218bb5e3
2013-12-13 14:17:11 -06:00
Richard Peter
756baaefb8
Issue #2170 : Fix PluginNotifier direct-vm endpoints
...
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c
Former-commit-id: 6267bee5d5
[formerly 595a655dfd
[formerly b9415039acdc85ee7975e9d6bd27047cce623723]]
Former-commit-id: 595a655dfd
Former-commit-id: cfd3810476
2013-12-13 12:32:46 -06:00
Lee Venable
197a8b5508
Issue #2583 - Procedure dialog fixes and clean up.
...
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10
Former-commit-id: 7ee6053c22
[formerly aa0e9121f8
[formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]
Former-commit-id: aa0e9121f8
Former-commit-id: d6eb7534f5
2013-12-12 16:15:56 -06:00
Steve Harris
a2ae393ec1
14.1.1-13 baseline
...
Former-commit-id: b0b55a676b
[formerly c88b10039a
[formerly 6eef3022653638f9031a85932d8d551aba5600d2]]
Former-commit-id: c88b10039a
Former-commit-id: 85eebac7e2
2013-12-12 16:59:57 -05:00
Richard Peter
6b2c2ac57c
Issue #2170 : Add registration of Router to Notification Framework
...
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad
Former-commit-id: ded9c782fc
[formerly 312fcc2b2f
[formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]
Former-commit-id: 312fcc2b2f
Former-commit-id: db0e9d40ec
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
1b99b5aca0
Issue #2619 Fix rare dateline bug.
...
Former-commit-id: 607b5edb69
[formerly 399c579671
[formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]
Former-commit-id: 399c579671
Former-commit-id: 45e4b4bbad
2013-12-12 10:30:22 -06:00
Richard Peter
920fc0cd6c
Merge "Issue #2613 Fixed build" into omaha_14.2.1
...
Former-commit-id: 2f2f755110
[formerly ffab0f1669
[formerly c1630accf918363334c4d558cda8810341d0a2b7]]
Former-commit-id: ffab0f1669
Former-commit-id: 55047d6807
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
edc39cafac
Issue #2613 Fixed build
...
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14
Former-commit-id: 2e909bc207
[formerly 7529f5bbe8
[formerly ce2bffa120b722cb3337658584a83c5161f07a51]]
Former-commit-id: 7529f5bbe8
Former-commit-id: 5f3e8a5436
2013-12-12 09:44:05 -06:00
Richard Peter
71d88ca431
Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
...
Former-commit-id: 3cc5ebc43e
[formerly 91dc7825ce
[formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]
Former-commit-id: 91dc7825ce
Former-commit-id: 247eb683e5
2013-12-11 18:00:10 -06:00
Richard Peter
d4b5572775
Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
...
Former-commit-id: a0f59f2059
[formerly 49def8a4b2
[formerly 4da283cae33cca8264007e246fa3d02b9809a114]]
Former-commit-id: 49def8a4b2
Former-commit-id: e41adf1ee9
2013-12-11 17:59:43 -06:00
Brad Gonzales
1c027db49b
Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
...
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c
Former-commit-id: 96dc3b65b1
[formerly 112649eff2
[formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]
Former-commit-id: 112649eff2
Former-commit-id: 6515d6a9e5
2013-12-11 17:06:41 -06:00
Richard Peter
ce63ee408b
Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
...
Former-commit-id: 6f57e14406
[formerly 63bd2b26eb
[formerly 3d887a288459b786718a59d0c4a368408c3419f0]]
Former-commit-id: 63bd2b26eb
Former-commit-id: f278dad7cc
2013-12-11 16:19:02 -06:00
Richard Peter
cfd32aee5f
Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
...
Former-commit-id: 0ed2ba8024
[formerly 375c532376
[formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]
Former-commit-id: 375c532376
Former-commit-id: 4ec080e015
2013-12-11 16:11:26 -06:00
Richard Peter
02e6e33eb8
Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
...
Former-commit-id: 51e46e08c5
[formerly d9d19a1515
[formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]
Former-commit-id: d9d19a1515
Former-commit-id: d720fbbd63
2013-12-11 16:08:06 -06:00
Mike Duff
fa87393135
Issue #2616 - Set overwrite allowed flag on madis records when decoded
...
Added delta script for table MADIS with the hibernate generated key name
Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519
Former-commit-id: 5a42580c2b
[formerly 9a02ae7d68
[formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]
Former-commit-id: 9a02ae7d68
Former-commit-id: 1a0893d70e
2013-12-11 14:12:05 -06:00
Richard Peter
453a1072eb
Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
...
Former-commit-id: 6e86c98c04
[formerly e441b548cc
[formerly e1e34142baebc23917a975a60f9f45aab750a775]]
Former-commit-id: e441b548cc
Former-commit-id: fcbf2ff270
2013-12-11 13:56:38 -06:00
Greg Armendariz
6dcfee182a
Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
...
Former-commit-id: 4c1eb198d2
[formerly 45c9f7352e
[formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]
Former-commit-id: 45c9f7352e
Former-commit-id: 78e1e9d78f
2013-12-11 13:54:17 -06:00
Greg Armendariz
74c49f1eee
Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
...
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3
Former-commit-id: 2d2641ea7e
[formerly cb952cdb13
[formerly 584c543fbab59889769570330e7d83529a6b733f]]
Former-commit-id: cb952cdb13
Former-commit-id: 57c98d4343
2013-12-11 13:46:27 -06:00
Ben Steffensmeier
c92b5842ab
Issue #2602 Switch around the order of some things on startup to make thinclient better.
...
Former-commit-id: 922674273e
[formerly a37db9d1b4
[formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]
Former-commit-id: a37db9d1b4
Former-commit-id: bf508b4455
2013-12-11 12:45:11 -06:00
Benjamin Phillippe
fd4e9edb76
Issue #2613 Registry performance enhancements
...
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21
Former-commit-id: 0cb4e61261
[formerly 969099d4c4
[formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]
Former-commit-id: 969099d4c4
Former-commit-id: b2c565c173
2013-12-11 12:20:12 -06:00
Mike Duff
9f5cf8e0c8
Issue #2625 - fix no data errors in bandwidth utilization graph
...
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime
Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7
Former-commit-id: 3492436907
[formerly d378d9194a
[formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]
Former-commit-id: d378d9194a
Former-commit-id: 4073f048d2
2013-12-11 11:29:38 -06:00
Brad Gonzales
31930d262d
Issue #2566 fix bandwidthmanager spring file resource resolution.
...
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731
Former-commit-id: cfa7128be2
[formerly 5dd466e22a
[formerly c12676830e66cf8e18f10e835c0f95e25074d992]]
Former-commit-id: 5dd466e22a
Former-commit-id: 419230d6db
2013-12-11 11:19:40 -06:00
Slav Korolev
51c0f8f92f
Issue #2570 . Show All subscriptions in Subscription manager.
...
Former-commit-id: 67e18055cc
[formerly b59e9499d2
[formerly 27e177b2425db0a0241884b18e2501a923d02be4]]
Former-commit-id: b59e9499d2
Former-commit-id: 85bc26b5a3
2013-12-11 08:57:13 -05:00
Nate Jensen
1d91d67a5b
Issue #2581 remove LSR dataURI column
...
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f
Former-commit-id: e037c179fe
[formerly fa674baf89
[formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]
Former-commit-id: fa674baf89
Former-commit-id: 6188356e72
2013-12-10 18:27:33 -06:00
Nate Jensen
438f02f87d
Merge "Issue #2581 fix decoding of LSR freezing drizzle and latlon" into omaha_14.2.1
...
Former-commit-id: fed233aff3
[formerly 7d4256d0d6
[formerly ae4051f529397b7a8b955bfd6ed56d446235e2a4]]
Former-commit-id: 7d4256d0d6
Former-commit-id: 50e0f15ec8
2013-12-10 15:18:27 -06:00
Nate Jensen
2dc27feedc
Issue #2581 fix decoding of LSR freezing drizzle and latlon
...
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5
Former-commit-id: 16b0650f67
[formerly 60d395b347
[formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]
Former-commit-id: 60d395b347
Former-commit-id: c0c17822c2
2013-12-10 10:10:11 -06:00
Mike Duff
8b49b1dea7
Issue #2601 - Fix NullPointerException.
...
Former-commit-id: d2fe42c27c
[formerly 9e9706f55f
[formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]
Former-commit-id: 9e9706f55f
Former-commit-id: 773e546f62
2013-12-10 09:03:42 -06:00