You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/05/16 13:39:12 UTC
svn commit: r1744046 - in /qpid/java/trunk/broker-core/src:
main/java/org/apache/qpid/server/logging/
main/java/org/apache/qpid/server/model/adapter/
main/java/org/apache/qpid/server/queue/
test/java/org/apache/qpid/server/logging/logback/
Author: lquack
Date: Mon May 16 13:39:12 2016
New Revision: 1744046
URL: http://svn.apache.org/viewvc?rev=1744046&view=rev
Log:
QPID-7267: [Java Broker] Do not set Content-Length header explicitly
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java?rev=1744046&r1=1744045&r2=1744046&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PathContent.java Mon May 16 13:39:12 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/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1744046&r1=1744045&r2=1744046&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Mon May 16 13:39:12 2016
@@ -1283,11 +1283,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/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1744046&r1=1744045&r2=1744046&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Mon May 16 13:39:12 2016
@@ -2698,12 +2698,6 @@ public abstract class AbstractQueue<X ex
return _messageReference.getMessage().getMessageHeader().getMimeType();
}
- @RestContentHeader("Content-Length")
- public long getSize()
- {
- return _messageReference.getMessage().getSize();
- }
-
}
private static class AcquireAllQueueEntryFilter implements QueueEntryFilter
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java?rev=1744046&r1=1744045&r2=1744046&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java Mon May 16 13:39:12 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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org