Author: lquack
Date: Mon May 16 13:57:19 2016
New Revision: 1744050
URL: http://svn.apache.org/viewvc?rev=1744050&view=rev
Log:
QPID-7267: [Java Broker] Do not set Content-Length header explicitly
merged from trunk with:
$ svn merge -c 1744046 ^/qpid/java/trunk
resolved one trivial conflict in AbstractQueue manually.
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 13:57:19 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-1729
657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742544,1742900,1742926,1743161,1743228,1743383,1744012-1744013
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-1729
657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742544,1742900,1742926,1743161,1743228,1743383,1744012-1744013,1744046
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java?rev=1744050&r1=1744049&r2=1744050&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java
Mon May 16 13:57:19 2016
@@ -51,12 +51,6 @@ public class PathContent implements Cont
return _contentType;
}
- @RestContentHeader("Content-Length")
- public long getContentLength()
- {
- return _contentSize;
- }
-
@RestContentHeader("Content-Disposition")
public String getContentDisposition()
{
Modified:
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1744050&r1=1744049&r2=1744050&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Mon May 16 13:57:19 2016
@@ -1221,11 +1221,5 @@ public class BrokerAdapter extends Abstr
{
return "text/plain;charset=utf-8";
}
-
- @RestContentHeader("Content-Length")
- public long getSize()
- {
- return _threadStackTraces == null ? 0 :
_threadStackTraces.length();
- }
}
}
Modified:
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1744050&r1=1744049&r2=1744050&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Mon May 16 13:57:19 2016
@@ -2619,12 +2619,6 @@ public abstract class AbstractQueue<X ex
return _mimeType;
}
- @RestContentHeader("Content-Length")
- public long getSize()
- {
- return _data.length;
- }
-
}
private static class AcquireAllQueueEntryFilter implements QueueEntryFilter
Modified:
qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java?rev=1744050&r1=1744049&r2=1744050&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
Mon May 16 13:57:19 2016
@@ -111,7 +111,6 @@ public class RolloverWatcherTest extends
assertEquals("Unexpected content type", "text/plain",
content.getContentType());
assertEquals("Unexpected data", "test", readContent(content));
- assertEquals("Unexpected size", 4, content.getContentLength());
assertEquals("Unexpected content disposition", "attachment;
filename=\"" + _activeFile.getName().toString() + "\"",
content.getContentDisposition());
}
@@ -139,7 +138,6 @@ public class RolloverWatcherTest extends
assertEquals("Unexpected content type", "application/x-gzip",
content.getContentType());
assertEquals("Unexpected data", "test.gz", readContent(content));
- assertEquals("Unexpected size", 7, content.getContentLength());
assertEquals("Unexpected content disposition", "attachment;
filename=\"test1.gz\"", content.getContentDisposition());
}
@@ -153,7 +151,6 @@ public class RolloverWatcherTest extends
assertEquals("Unexpected content type", "application/x-zip",
content.getContentType());
assertEquals("Unexpected content disposition", "attachment",
content.getContentDisposition());
- assertEquals("Unexpected size", 0, content.getContentLength());
try
{
readContent(content);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
