← Back to branch summary

~ubuntu-branches/ubuntu/wily/libjboss-remoting-java/wily

« back to all changes in this revision

Viewing changes to debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch

  • Committer: Package Import Robot
  • Author(s): Torsten Werner
  • Date: 2011-09-09 14:01:03 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: package-import@ubuntu.com-20110909140103-hqokx61534tas9rg
Tags: 2.5.3.SP1-1
http://bugs.debian.org/628303
* Newer but not newest upstream release. Do not build samples.
* Change debian/watch to upstream's svn repo.
* Add patch to fix compile error caused by tomcat update.
  (Closes: #628303)
* Switch to source format 3.0.
* Switch to debhelper level 7.
* Remove useless Depends.
* Update Standards-Version: 3.9.2.
* Update README.source.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch
 
1
From: Luke Cycon <lcycon@gmail.com>
 
2
Date: Fri, 9 Sep 2011 13:19:39 +0200
 
3
Subject: fix compile errors caused by tomcat API update
 
4
 
 
5
---
 
6
 .../remoting/transport/coyote/OutputBuffer.java    |    5 +++--
 
7
 1 files changed, 3 insertions(+), 2 deletions(-)
 
8
 
 
9
diff --git a/src/main/org/jboss/remoting/transport/coyote/OutputBuffer.java b/src/main/org/jboss/remoting/transport/coyote/OutputBuffer.java
 
10
index b56999b..0feb63c 100644
 
11
--- a/src/main/org/jboss/remoting/transport/coyote/OutputBuffer.java
 
12
+++ b/src/main/org/jboss/remoting/transport/coyote/OutputBuffer.java
 
13
@@ -607,8 +607,9 @@ public class OutputBuffer extends Writer
 
14
 
 
15
       // The following has been updated to conform to jbossweb 2.1.
 
16
       cb.setChars(c, off, len);
 
17
-      while (cb.getLength() > 0) { 
 
18
-          conv.convert(cb, bb);
 
19
+      while (cb.getLength() > 0) {
 
20
+         conv.setByteChunk(bb);
 
21
+         conv.convert(cb.getChars(), 0, cb.getLength());
 
22
           if (cb.getLength() > 0) {
 
23
               bb.flushBuffer();
 
24
           }
 
25
--