You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/10/11 07:58:13 UTC

[1/6] git commit: CAMEL-7900 Honored chunksize in camel-hdfs2

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 4ff0ee9f0 -> 21ff69857
  refs/heads/camel-2.14.x 2bcac18c8 -> 301bc404e


CAMEL-7900 Honored chunksize in camel-hdfs2


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/230c0dd5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/230c0dd5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/230c0dd5

Branch: refs/heads/camel-2.14.x
Commit: 230c0dd52b68c9f4e9712dea220658e6bce00c75
Parents: 2bcac18
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 10 21:58:11 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Oct 11 13:56:20 2014 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/hdfs2/HdfsFileType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/230c0dd5/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
index 2df0bba..bbe0172 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
@@ -76,7 +76,7 @@ public enum HdfsFileType {
         public long next(HdfsInputStream hdfsistr, Holder<Object> key, Holder<Object> value) {
             try {
                 ByteArrayOutputStream bos = new ByteArrayOutputStream(hdfsistr.getChunkSize());
-                byte buf[] = new byte[HdfsConstants.DEFAULT_BUFFERSIZE];
+                byte buf[] = new byte[hdfsistr.getChunkSize()];
                 int bytesRead = ((InputStream) hdfsistr.getIn()).read(buf);
                 if (bytesRead >= 0) {
                     bos.write(buf, 0, bytesRead);


[3/6] git commit: CAMEL-7890 Enable the NamespaceAware option of SAXParserFactory in XmlConverter

Posted by ni...@apache.org.
CAMEL-7890 Enable the NamespaceAware option of SAXParserFactory in XmlConverter


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/301bc404
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/301bc404
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/301bc404

Branch: refs/heads/camel-2.14.x
Commit: 301bc404e82206d30f95e544d01f23732206226e
Parents: fae7008
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 10 23:32:15 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Oct 11 13:56:45 2014 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/301bc404/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index cdef86c..7a6d61d 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -603,6 +603,7 @@ public class XmlConverter {
                     LOG.warn("SAXParser doesn't support the feature {} with value {}, due to {}.", new Object[]{javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e});
                 }
             }
+            sfactory.setNamespaceAware(true);
             SAXParser parser = sfactory.newSAXParser();
             xmlReader = parser.getXMLReader();
         } catch (Exception ex) {


[5/6] git commit: CAMEL-7900 Honored chunksize in camel-hdfs2

Posted by ni...@apache.org.
CAMEL-7900 Honored chunksize in camel-hdfs2


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/246014f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/246014f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/246014f2

Branch: refs/heads/camel-2.13.x
Commit: 246014f27e77205541416b911a8fdb2c9756efee
Parents: 607ab4e
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 10 21:58:11 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Oct 11 13:57:33 2014 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/hdfs2/HdfsFileType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/246014f2/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
index bb08440..bc97355 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
@@ -76,7 +76,7 @@ public enum HdfsFileType {
         public long next(HdfsInputStream hdfsistr, Holder<Object> key, Holder<Object> value) {
             try {
                 ByteArrayOutputStream bos = new ByteArrayOutputStream(hdfsistr.getChunkSize());
-                byte buf[] = new byte[HdfsConstants.DEFAULT_BUFFERSIZE];
+                byte buf[] = new byte[hdfsistr.getChunkSize()];
                 int bytesRead = ((InputStream) hdfsistr.getIn()).read(buf);
                 if (bytesRead >= 0) {
                     bos.write(buf, 0, bytesRead);


[6/6] git commit: CAMEL-7890 Enable the NamespaceAware option of SAXParserFactory in XmlConverter

Posted by ni...@apache.org.
CAMEL-7890 Enable the NamespaceAware option of SAXParserFactory in XmlConverter


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21ff6985
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21ff6985
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21ff6985

Branch: refs/heads/camel-2.13.x
Commit: 21ff698571bcfa04d59f93f044b243a7ab587dff
Parents: 246014f
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 10 23:32:15 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Oct 11 13:57:44 2014 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/21ff6985/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 0532011..a3f4a29 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -579,6 +579,7 @@ public class XmlConverter {
             } catch (Exception e) {
                 LOG.warn("SAXParser doesn't support the feature {} with value {}, due to {}.", new Object[]{javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e});
             }
+            sfactory.setNamespaceAware(true);
             SAXParser parser = sfactory.newSAXParser();
             xmlReader = parser.getXMLReader();
         } catch (Exception ex) {


[4/6] git commit: CAMEL-7900 Honored chunksize in camel-hdfs

Posted by ni...@apache.org.
CAMEL-7900 Honored chunksize in camel-hdfs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/607ab4e8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/607ab4e8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/607ab4e8

Branch: refs/heads/camel-2.13.x
Commit: 607ab4e83cb4af96b88d90a62bfdd1b609c53ce0
Parents: 4ff0ee9
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 10 21:58:47 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Oct 11 13:57:24 2014 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/hdfs/HdfsFileType.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/607ab4e8/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
index a3b2112..97c174f 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
@@ -75,7 +75,7 @@ public enum HdfsFileType {
         public long next(HdfsInputStream hdfsistr, Holder<Object> key, Holder<Object> value) {
             try {
                 ByteArrayOutputStream bos = new ByteArrayOutputStream(hdfsistr.getChunkSize());
-                byte buf[] = new byte[HdfsConstants.DEFAULT_BUFFERSIZE];
+                byte buf[] = new byte[hdfsistr.getChunkSize()];
                 int bytesRead = ((InputStream) hdfsistr.getIn()).read(buf);
                 if (bytesRead >= 0) {
                     bos.write(buf, 0, bytesRead);


[2/6] git commit: CAMEL-7900 Honored chunksize in camel-hdfs

Posted by ni...@apache.org.
CAMEL-7900 Honored chunksize in camel-hdfs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fae7008d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fae7008d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fae7008d

Branch: refs/heads/camel-2.14.x
Commit: fae7008d2f93575cde20461539d215970c89025c
Parents: 230c0dd
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 10 21:58:47 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Oct 11 13:56:35 2014 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/hdfs/HdfsFileType.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fae7008d/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
index a3b2112..97c174f 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
@@ -75,7 +75,7 @@ public enum HdfsFileType {
         public long next(HdfsInputStream hdfsistr, Holder<Object> key, Holder<Object> value) {
             try {
                 ByteArrayOutputStream bos = new ByteArrayOutputStream(hdfsistr.getChunkSize());
-                byte buf[] = new byte[HdfsConstants.DEFAULT_BUFFERSIZE];
+                byte buf[] = new byte[hdfsistr.getChunkSize()];
                 int bytesRead = ((InputStream) hdfsistr.getIn()).read(buf);
                 if (bytesRead >= 0) {
                     bos.write(buf, 0, bytesRead);