xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2672 Fix serialization of jts envelopes.

Browse source 
Former-commit-id: 42b0e215a3e2bfe4ca8d789f025c49d8f35f6a6c
This commit is contained in:
Ben Steffensmeier 2014-02-06 11:26:50 -06:00
parent d863bf208c
commit 97eef922ef
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
View file

@ -40,12 +40,14 @@ import com.raytheon.uf.common.util.SizeUtil;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 10, 2009 mschenke Initial creation
* Jul 24, 2012 njensen Enhanced logging
* Jun 24, 2013 2136 rjpeter Switched to accepting InputStream to reduce garbage
* objected generated by camel doing the auto conversion.
* Date Ticket# Engineer Description
* ------------- -------- ----------- -----------------------------------------
* Aug 10, 2009 mschenke Initial creation
* Jul 24, 2012 njensen Enhanced logging
* Jun 24, 2013 2136 rjpeter Switched to accepting InputStream to
* reduce garbage objected generated by
* camel doing the auto conversion.
* Feb 06, 2014 2672 bsteffen Return error when Stream is not consumed.
* </pre>
*
* @author mschenke
@ -64,6 +66,11 @@ public class RemoteRequestRouteWrapper {
long startTime = System.currentTimeMillis();
Object obj = SerializationUtil.transformFromThrift(Object.class,
data);
int remaining = data.available();
if (remaining > 0) {
throw new IllegalStateException(remaining
+ " unexpected bytes remaining after deserialization");
}
IServerRequest request = null;
if (obj instanceof RequestWrapper) {
request = ((RequestWrapper) obj).getRequest();

5
pythonPackages/dynamicserialize/adapters/__init__.py
View file

@ -30,6 +30,8 @@
# 08/31/10 njensen Initial Creation.
# 03/20/13 #1774 randerso Added TimeConstraintsAdapter
# 04/22/13 #1949 rjpeter Added LockTableAdapter
# 02/06/14 #2672 bsteffen Added JTSEnvelopeAdapter
#
#
@ -53,7 +55,8 @@ __all__ = [
'FloatBufferAdapter',
'ByteBufferAdapter',
'TimeConstraintsAdapter',
'LockTableAdapter'
'LockTableAdapter',
'JTSEnvelopeAdapter'
# 'GridDataHistoryAdapter',
]