Commit graph

807 commits

Author SHA1 Message Date
Roger Ferrel
71834c493c Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: b32ac22ef8 [formerly b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]
Former-commit-id: 4f889b6999
Former-commit-id: a838aa2d74
2013-03-19 16:24:22 -05:00
Dustin Johnson
889953c712 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: 5b4035fb11 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]
Former-commit-id: 8363eba409
Former-commit-id: e0b6e6187e
2013-03-19 13:09:48 -05:00
Dave Hladky
64f8c46e64 Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: ddb23ae59f [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: f0244f54a4
2013-03-19 13:08:14 -05:00
Steve Harris
22bb7ecd33 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b8f0635ad6 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
2013-03-18 16:52:00 -05:00
Steve Harris
fc6748cb3e Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 1a999fee5a [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
2013-03-18 16:43:22 -05:00
Bryan Kowal
56f2b3f0c2 Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: b954bc17bf [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: 7fd035256d
Former-commit-id: 66e2ed79ec
2013-03-18 16:36:33 -05:00
Steve Harris
0c94cc97fb 13.3.1-8 baseline
Former-commit-id: f97d78994b [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
2013-03-18 15:43:32 -05:00
Dustin Johnson
805c491c04 Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
Former-commit-id: b7a5311dde [formerly b7a5311dde [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]
Former-commit-id: 7fe3c254fd
Former-commit-id: 55095f0041
2013-03-15 16:14:17 -05:00
Nate Jensen
d622b8c12e Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: e65267d5f3 [formerly e65267d5f3 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]
Former-commit-id: 235952a115
Former-commit-id: dad08657aa
2013-03-15 16:10:11 -05:00
Max Schenkelberg
af973ff5a6 Issue #1638 Fixed Velocity templates for windows build
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a

Former-commit-id: 2c3ee8d35d [formerly 2c3ee8d35d [formerly da9666be71adf84f394f255406a66afa6c3f28be]]
Former-commit-id: beb801517e
Former-commit-id: 582de5717c
2013-03-15 12:16:59 -05:00
Dustin Johnson
a08059dd34 Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: ecb0d2c826 [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: 43a9f608ef
Former-commit-id: 1b82ad0dc4
2013-03-15 11:51:58 -05:00
Bryan Kowal
bc0c82dad8 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: 0d33c86abe [formerly 0d33c86abe [formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: e83033b314
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
bc92e1be6b Issue #1777 fix subgridding range problems
Former-commit-id: 5bd20414eb [formerly 5bd20414eb [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]
Former-commit-id: 0daa5817d0
Former-commit-id: a6140145a4
2013-03-14 09:56:00 -05:00
Bryan Kowal
39ff5c7945 Issue #1772 - remove references to the DEV_MODE jvm parameter
- removed ScriptLibraryManager.java

Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e

Former-commit-id: dd811f674b [formerly dd811f674b [formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]
Former-commit-id: 58316907ae
Former-commit-id: 86c287bb33
2013-03-14 09:54:11 -05:00
David Gillingham
b121f99015 Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Former-commit-id: 7c74510723 [formerly 7c74510723 [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]
Former-commit-id: 566927980a
Former-commit-id: 90b8c80837
2013-03-13 17:14:59 -05:00
Nate Jensen
4539ef8b58 Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
Former-commit-id: dbd2729336 [formerly dbd2729336 [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]
Former-commit-id: eaef235e8e
Former-commit-id: d881ab1442
2013-03-13 16:17:44 -05:00
Bryan Kowal
1e9054ce15 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 729bc9c4bb [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]
Former-commit-id: 5e86ef080e
Former-commit-id: 58e035a024
2013-03-13 14:44:05 -05:00
Dave Hladky
cb5ee4a7b8 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 38b952a220 [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
04882c798f Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 36b3c16a42 [formerly 36b3c16a42 [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]
Former-commit-id: ddf2092bde
Former-commit-id: 247c9f6c1f
2013-03-13 13:21:16 -05:00
Steve Harris
3084a860cd 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Dustin Johnson
06b39b848b Issue #1784 Move NCF bandwidth manager code to data delivery repo
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 71365cd945 [formerly 71365cd945 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]
Former-commit-id: 1930183036
Former-commit-id: 48a96911c8
2013-03-13 08:39:08 -05:00
Roger Ferrel
5546691fd6 Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4

Former-commit-id: c5a2786c84 [formerly c5a2786c84 [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]
Former-commit-id: b5743e8f9b
Former-commit-id: 8bb9044e3a
2013-03-12 16:58:06 -05:00
Nate Jensen
d0f70dafb3 Merge "Issue #1638 fix velocity on windows" into development
Former-commit-id: 4486bd9941 [formerly 4486bd9941 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]
Former-commit-id: 676b3c9d11
Former-commit-id: 33f185d021
2013-03-12 16:43:13 -05:00
Nate Jensen
d8197235fe Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 863d4cf3df [formerly 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]
Former-commit-id: cbf0343d72
Former-commit-id: b00ccd2b77
2013-03-12 16:04:59 -05:00
Steve Harris
5232592cfa Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 753a5213ab [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
29ed641a13 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: a1006667e0 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Dustin Johnson
fbb8745ce5 Issue #1778 Watch for bandwidth configuration changes
Amend: Peer review comments

Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e

Former-commit-id: 4c7f7801fa [formerly 4c7f7801fa [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]
Former-commit-id: 794812fb23
Former-commit-id: 33fe353252
2013-03-12 12:02:09 -05:00
Mike Duff
5ed9b7b6d0 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: d1d694e1db [formerly d1d694e1db [formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]
Former-commit-id: ec0d814aa6
Former-commit-id: 7fbc376ec4
2013-03-12 10:42:13 -05:00
Steve Harris
c6f379f59a 13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Roger Ferrel
0bbe51355e Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 4deb731bd0 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
2013-03-11 13:00:44 -05:00
Roger Ferrel
a8436c76ad Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 6744238fce [formerly 6744238fce [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]
Former-commit-id: 9e8472bab6
Former-commit-id: 3684c7efed
2013-03-11 11:16:22 -05:00
David Gillingham
87d4bdd646 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Former-commit-id: 4459ecfa78 [formerly 4459ecfa78 [formerly a3918b30452a829a8f0cd562021959246bf1144a]]
Former-commit-id: 1518c0b53c
Former-commit-id: 251da90765
2013-03-07 17:25:14 -06:00
Nate Jensen
a2f804350a Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 5e3d6df7e0 [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]
Former-commit-id: 5c59a61cef
Former-commit-id: d7902aba68
2013-03-07 16:49:40 -06:00
Dustin Johnson
d9585dd27e Issue #1647 Write out data targeted for the SBN as hidden, then rename
Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e

Former-commit-id: 959e7e39d3 [formerly 959e7e39d3 [formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]]
Former-commit-id: 2a6edae82b
Former-commit-id: e5670ffdb4
2013-03-07 14:39:34 -06:00
David Gillingham
2ca8e5e42a Issue #1447: Implement active table fetching, make bug fixes
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: 95f8074c97 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 5ad72e2a7f
2013-03-06 14:23:00 -06:00
Dustin Johnson
e6fb231413 Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
Former-commit-id: 2262872d2d [formerly 2262872d2d [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]
Former-commit-id: 90b18cc477
Former-commit-id: c28f99971c
2013-03-05 15:01:02 -06:00
Dustin Johnson
f6431b52bf Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: d4c6c29f5f [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]
Former-commit-id: 3eddb2d286
Former-commit-id: bfed4555a2
2013-03-05 13:32:04 -06:00
Steve Harris
46d0c9fcee Merge branch 'omaha_13.3.1' into development
Former-commit-id: d5b80f9225 [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
Steve Harris
b630339eb7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 305dd72969 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
2013-03-05 12:27:49 -06:00
Dustin Johnson
13db762ae2 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 8107f76d98 [formerly 8107f76d98 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]
Former-commit-id: 547780f9a3
Former-commit-id: 043f122356
2013-03-05 11:39:42 -06:00
Mike Duff
78953a3fd7 Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb

Former-commit-id: 6809cb6f80 [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]
Former-commit-id: 193cf1e54f
Former-commit-id: 775a0e3edd
2013-03-05 11:26:54 -06:00
Steve Harris
1f98e01c57 13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
2013-03-05 10:47:06 -06:00
Steve Harris
0df35cc5ec 13.3.1-4 baseline
Former-commit-id: 8c0b90f292 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
2013-03-05 10:39:59 -06:00
Nate Jensen
432a0d1550 Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: 75d959f536 [formerly 75d959f536 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 910b8c7d25
2013-03-05 09:10:31 -06:00
Dustin Johnson
a5c331790e Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: c6137e89e7 [formerly c6137e89e7 [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]
Former-commit-id: ef632b7bfa
Former-commit-id: b3f7f77bf6
2013-03-05 08:53:09 -06:00
Richard Peter
6b08735982 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 070f62d08e [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 784cd2145f
Former-commit-id: 180540eb47
2013-03-04 17:48:05 -06:00
Dave Hladky
fc90d47619 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 680317d9c4 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
2013-03-04 17:41:11 -06:00
Bryan Kowal
5dae6fd039 Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a

Former-commit-id: 862f97a19b [formerly 862f97a19b [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]
Former-commit-id: cd08f88c43
Former-commit-id: d9c1a92b8e
2013-03-04 15:52:07 -06:00
Dustin Johnson
5da3043a97 Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 1161125c84 [formerly 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]
Former-commit-id: 54c3980cba
Former-commit-id: c0a1ae396a
2013-03-04 14:55:50 -06:00
Steve Harris
5baddd4678 Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit c990477402 [formerly f7ffa22c7c] [formerly f4cccabc07] [formerly 2a575a24e7 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]].


Former-commit-id: 28391884a7 [formerly 28391884a7 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]
Former-commit-id: fcb48a7280
Former-commit-id: 9e87721b85
2013-03-04 13:03:19 -06:00