xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4997 commits 31 branches 40 tags 3.8 GiB
Commit graph

4997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Steffensmeier
a9c4875038 Issue #2896 Fix sat best res on weird projections 
Former-commit-id: 560fc688bc [formerly 8bb517836a [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]
Former-commit-id: 8bb517836a
Former-commit-id: c7fa392f3f
 2014-03-11 11:07:43 -05:00
Nate Jensen
ebf5186d75 Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]
Former-commit-id: ccb06db199
Former-commit-id: 17aa39ce0a
 2014-03-11 10:28:01 -05:00
Brian.Dyke
1cb3691cc4 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1 
Former-commit-id: fcc9115b0d [formerly 552490206f [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]
Former-commit-id: 552490206f
Former-commit-id: fa16721854
 2014-03-11 10:44:03 -04:00
Juliya Dynina
2b55a4240e Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1 
Former-commit-id: 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]
Former-commit-id: 6bbd88e62c
Former-commit-id: b3ec4c363f
 2014-03-11 09:24:12 -05:00
Brian.Dyke
90154e7ae1 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 4269f9d875 [formerly c6f2010ce6 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]
Former-commit-id: c6f2010ce6
Former-commit-id: bcf9a5dc83
 2014-03-10 15:42:38 -04:00
brian.dyke
730491d4bb Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]
Former-commit-id: 654778bb0d
Former-commit-id: 1a482f91bc
 2014-03-10 15:36:56 -04:00
Brian.Dyke
8d4a1e1204 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: fda6ab1344 [formerly d710aec521 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]
Former-commit-id: d710aec521
Former-commit-id: 24785068be
 2014-03-10 15:14:59 -04:00
steve.naples
a687ff690a ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch. 
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97

Former-commit-id: 20582ab173 [formerly 212677f94b [formerly cd7d6876338b98c320a8d7559c518e32e90e3000]]
Former-commit-id: 212677f94b
Former-commit-id: 0d44e46f88
 2014-03-10 17:47:25 +00:00
steve.naples
e7d6b6d08b ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion. 
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e

Former-commit-id: 7432b146ed [formerly 915e3c2c66 [formerly 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314]]
Former-commit-id: 915e3c2c66
Former-commit-id: c877c8b61b
 2014-03-10 17:40:35 +00:00
Nate Jensen
b77dde280f Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]
Former-commit-id: 6a75fe686a
Former-commit-id: 5a88f31a2b
 2014-03-10 10:03:02 -05:00
Stephen Gilbert
8560c21c50 VLab Issue #3224 - NSHARP: Fix erroneous mixing heights 
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: f203a4c035 [formerly 65dd8b4c3c [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]
Former-commit-id: 65dd8b4c3c
Former-commit-id: 200c7e60da
 2014-03-07 19:10:08 -05:00
Stephen Gilbert
ba4869af46 VLab Issue #3223 - NSHARP: Improve selection operation 
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: e3aedaa1d6 [formerly 9a457213bb [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]
Former-commit-id: 9a457213bb
Former-commit-id: 5fcb45a629
 2014-03-07 19:07:28 -05:00
Stephen Gilbert
78e4214f3d VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP 
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: 49a6d6ec7e [formerly 1632166902 [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]
Former-commit-id: 1632166902
Former-commit-id: a7fd09a409
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
6f8caa3515 VLab Issue #3221 - Fix XML serialization problems 
A few problems reading/writing XML files were noticed after upgrading to
14.2.1.  This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.

Change-Id: I8aad4197029c70f72612299a25329687892884af

Former-commit-id: 6dd6ae8d36 [formerly 625fcb0064 [formerly 4f58998c899e28521658bf17dee852592c534713]]
Former-commit-id: 625fcb0064
Former-commit-id: cce06bfbe3
 2014-03-07 18:36:42 -05:00
Steve Harris
da2d7fc334 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]
Former-commit-id: 92232fa063
Former-commit-id: 068297b90a
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
bd02f6a1a6 ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: 56a949fba8 [formerly 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]
Former-commit-id: 41a4905f9f
Former-commit-id: e894b1279a
 2014-03-07 14:53:54 -05:00
Shawn.Hooper
94e4e3e649 ASM #377 - Baseline National River Location Database fails 
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 85db05e819 [formerly 670da1895b [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]
Former-commit-id: 670da1895b
Former-commit-id: 6a8a1c397b
 2014-03-07 13:12:11 -05:00
Shawn.Hooper
fb051c5a5f ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]
Former-commit-id: 8c9f9b3ae0
Former-commit-id: b46b87cb5e
 2014-03-07 12:57:36 -05:00
Brian.Dyke
92bff38059 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 1fe5504d4c [formerly 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]
Former-commit-id: 3ac2a61218
Former-commit-id: 48cc3b6c55
 2014-03-07 11:50:06 -05:00
David Friedman
b8aadf1781 ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]
Former-commit-id: 2c1a3442d6
Former-commit-id: 103fece7b7
 2014-03-07 14:58:09 +00:00
Brian.Dyke
c2449e7821 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]
Former-commit-id: 394076196b
Former-commit-id: a0e3f08fce
 2014-03-07 09:01:09 -05:00
Brian.Dyke
e1cc8eb59a Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]
Former-commit-id: 312cd8a3e8
Former-commit-id: 0bbf137b05
 2014-03-07 08:57:07 -05:00
Brian.Dyke
1dcc56775d 14.1.1-22 baseline 
Former-commit-id: 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]
Former-commit-id: 21f17d4f9b
Former-commit-id: fe30e1d545
 2014-03-07 08:49:00 -05:00
Steve Harris
93aa41a34b Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]
Former-commit-id: 7f1ad89df9
Former-commit-id: 3358e8d6ef
 2014-03-06 18:19:55 -06:00
Juliya Dynina
7686e3c22f Merge "ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)" into asm_14.2.2 
Former-commit-id: a5514689cd [formerly 1d2b7f8f94 [formerly 165999c4d3048b27d97cf530ec21051721c9747c]]
Former-commit-id: 1d2b7f8f94
Former-commit-id: 13de22927f
 2014-03-06 15:53:31 -05:00
David Friedman
e7def94c5f ASM #74 - Fix RadarServer configuration import utility JAR dependency 
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: d08597a0d4 [formerly 11d0d191fd [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]
Former-commit-id: 11d0d191fd
Former-commit-id: fa849dfefa
 2014-03-06 17:07:23 +00:00
Brian.Dyke
b8a4de2bf0 Merge 13.5.3 DR_16824 
Former-commit-id: dafe7e6a42 [formerly b8fd0f16ed [formerly 1b9ed749da0d1893f44e68400644f37c763e324a]]
Former-commit-id: b8fd0f16ed
Former-commit-id: 7baa5ee0d5
 2014-03-06 11:22:08 -05:00
Brian.Dyke
8c54df9e0c ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change) 
Former-commit-id: 010b7a1df5 [formerly 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]
Former-commit-id: 1778d20745
Former-commit-id: 26fe429c4b
 2014-03-06 11:04:34 -05:00
Brian.Dyke
e5972b7159 ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf) 
Former-commit-id: cb1b4a7ac5 [formerly 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]
Former-commit-id: 2dbac1697d
Former-commit-id: 6313b7af0c
 2014-03-06 10:56:44 -05:00
Brian.Dyke
972c2c284b ASM #124 - Display GLD360 lightning data 
Former-commit-id: eefe8c45fe [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]
Former-commit-id: db274c890f
Former-commit-id: bd81ebd8c2
 2014-03-06 10:54:15 -05:00
Steve Harris
52226061e9 Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
 2014-03-06 08:39:43 -06:00
Qinglu.Lin
6eff5dd2a7 ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen) 
Change-Id: I438fe078be9161e58faebc25b03f8416e9f00319

Former-commit-id: e9d6eae852 [formerly b31998815d [formerly 5ffc345efdc6d1d9fabf522f3247a1f1c4f62d6b]]
Former-commit-id: b31998815d
Former-commit-id: 8ad36bdda1
 2014-03-05 16:51:03 -05:00
Steve Harris
18ae41769e Merge branch 'master_14.2.1' into ncep_14.2.1 
Former-commit-id: 4b01c57c0a [formerly 167ce61d6c [formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]
Former-commit-id: 167ce61d6c
Former-commit-id: 1a666f9f71
 2014-03-05 13:00:23 -06:00
Lee Venable
3c85140ba0 Issue #2833 - fixed a widget disposed error. 
Former-commit-id: 980e21ca5a [formerly e71dad9c80 [formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]
Former-commit-id: e71dad9c80
Former-commit-id: f38afb0976
 2014-03-05 08:37:13 -06:00
Benjamin Phillippe
7ad21da089 Issue #2769: Added batching to registry sync 
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 9fd35140f0 [formerly 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]]
Former-commit-id: 59323be87e
Former-commit-id: 7bf51d507e
 2014-03-04 13:31:41 -06:00
Richard Peter
2b5339e16f Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1 
Former-commit-id: f9bd27c061 [formerly aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]
Former-commit-id: aa8e1a3625
Former-commit-id: 5280398130
 2014-03-04 12:54:23 -06:00
John.McPherson
43f04342eb ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup 
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a

Former-commit-id: 2d8ce4e577 [formerly bdbe5577e9 [formerly 4d9b74dc181c359681eda8bae04f7c46f41d5769]]
Former-commit-id: bdbe5577e9
Former-commit-id: 058bb8d60e
 2014-03-04 17:24:00 +00:00
Nate Jensen
645fec513a Issue #2813 fix subscription package names 
Former-commit-id: d7d0803ee9 [formerly 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]
Former-commit-id: 0ec866f1d2
Former-commit-id: af76b58b27
 2014-03-04 10:53:58 -06:00
Brian.Dyke
5179a4f970 OB_14.1.1-21 baseline 
Former-commit-id: 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]
Former-commit-id: 1d92e5bab6
Former-commit-id: 271ec85c0c
 2014-03-04 11:47:42 -05:00
Benjamin Phillippe
ea31c5b370 Issue #2769: Registry database deadlocking fixes/performance improvements 
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]
Former-commit-id: ed050996a2
Former-commit-id: d339e232f4
 2014-03-03 10:57:16 -06:00
Juliya Dynina
fbe297b24b Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2 
Former-commit-id: 4bc91be899 [formerly 0130876a7a [formerly 081b98f0e1a2dad2d4aff981cbe9980e0c97e12a]]
Former-commit-id: 0130876a7a
Former-commit-id: 6fd59caff3
 2014-03-03 11:27:39 -05:00
Lee Venable
fec690642e Issue #2795 - removed test code. 
Former-commit-id: f94bcc4d3f [formerly 28fe1e99e2 [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]
Former-commit-id: 28fe1e99e2
Former-commit-id: e34e636dc7
 2014-02-27 15:46:30 -06:00
Richard Peter
63da19f472 Issue #2509: Fix Merge of 13.5.2-4 ncep resources 
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]
Former-commit-id: 86d42ed603
Former-commit-id: c267c5a08f
 2014-02-27 13:46:47 -06:00
Richard Peter
ae39697315 Issue #2509: Fix merge of SS #124 
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]
Former-commit-id: 729d608a15
Former-commit-id: a23c8f2c27
 2014-02-27 13:20:49 -06:00
Mike Duff
4bf028c4d7 Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons 
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d

Former-commit-id: 42982306ab [formerly 801abc37a2 [formerly 048b3ab40864d13baa7bcd9c8aef04564ec8a5f9]]
Former-commit-id: 801abc37a2
Former-commit-id: 7d14383bed
 2014-02-27 12:01:30 -06:00
Melissa Porricel
ce444f1ea0 ASM #78 - Fix MDCRS display 
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38

Former-commit-id: e5213e9415 [formerly 769fc1ed2f [formerly 2c655d5313882f811219c7a16f713d977008f949]]
Former-commit-id: 769fc1ed2f
Former-commit-id: 20624da288
 2014-02-27 12:48:09 -05:00
Steve Harris
26959b4fbb Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 99f53876d7 [formerly 5218a4d1e6 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]
Former-commit-id: 5218a4d1e6
Former-commit-id: 182c16067c
 2014-02-27 10:02:43 -06:00
Juliya Dynina
86838cc422 Merge "ASM #236" into asm_14.2.2 
Former-commit-id: 09708ce0ba [formerly 7d2a404f66 [formerly 8ddc79c66a4131f9671b605057abf916200a276a]]
Former-commit-id: 7d2a404f66
Former-commit-id: a0af710ac3
 2014-02-27 09:48:01 -05:00
Brian.Dyke
2613e13e08 OB_14.1.1-20 baseline 
Former-commit-id: 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 324696c436
Former-commit-id: b2401d2f0d
 2014-02-26 17:39:15 -05:00
Lee Venable
191ca5f9ca Issue #2795 - added code to check for null images. 
Former-commit-id: 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]
Former-commit-id: 0c7395d423
Former-commit-id: 5546b537cf
 2014-02-26 15:50:46 -06:00