You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/01 07:13:15 UTC

[01/10] camel git commit: Update CMISSessionFacade.java

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 121a83461 -> 035120f6d
  refs/heads/camel-2.19.x 9d4162632 -> 796f056b9
  refs/heads/master 6c1c81609 -> 67372dd8e


Update CMISSessionFacade.java

Fixing possible null-pointer of document variable.

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

Branch: refs/heads/master
Commit: 743d8557c9867286117a915e5b8b50fcf20a3217
Parents: 1fbb5b8
Author: Tomáš Burian <to...@lundegaard.eu>
Authored: Wed May 31 17:03:22 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:09:41 2017 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/cmis/CMISSessionFacade.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/743d8557/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index d143d7c..0af07d2 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,9 +182,11 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        ContentStream contentStream = document.getContentStream();
-        if (document != null && contentStream != null) {
-            return contentStream.getStream();
+        if(document != null) {
+            ContentStream contentStream = document.getContentStream();
+            if (contentStream != null) {
+                return contentStream.getStream();
+            }
         }
         return null;
     }


[09/10] camel git commit: Fixed CS. This closes #1731

Posted by da...@apache.org.
Fixed CS. This closes #1731


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

Branch: refs/heads/camel-2.18.x
Commit: 035120f6de2ab373256ab5d094e58134abab4d03
Parents: 8c6ae74
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 1 09:11:25 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:12:32 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/035120f6/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 0af07d2..f5da95f 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,7 +182,7 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        if(document != null) {
+        if (document != null) {
             ContentStream contentStream = document.getContentStream();
             if (contentStream != null) {
                 return contentStream.getStream();


[10/10] camel git commit: This closes #1727. This closes #1724

Posted by da...@apache.org.
This closes #1727. This closes #1724


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

Branch: refs/heads/master
Commit: 67372dd8e88a51f6c259b0f6c569075ce73fd0a0
Parents: 7aa57ab
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 1 09:13:06 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:13:06 2017 +0200

----------------------------------------------------------------------

----------------------------------------------------------------------



[04/10] camel git commit: Update CMISSessionFacade.java

Posted by da...@apache.org.
Update CMISSessionFacade.java

Hi, this piece of code causes two calls in a row for content stream. Result of document.getContentStream() has to be stored and used where is needed, not to call document.getContentStream() in condition and than again in return statement.

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

Branch: refs/heads/camel-2.19.x
Commit: 5f734e810c574fc79418cb30ee41967d25060189
Parents: 9d41626
Author: Tomáš Burian <to...@lundegaard.eu>
Authored: Wed May 31 15:06:01 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:11:48 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5f734e81/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 7b47e69..d143d7c 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,8 +182,9 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        if (document != null && document.getContentStream() != null) {
-            return document.getContentStream().getStream();
+        ContentStream contentStream = document.getContentStream();
+        if (document != null && contentStream != null) {
+            return contentStream.getStream();
         }
         return null;
     }


[06/10] camel git commit: Fixed CS. This closes #1731

Posted by da...@apache.org.
Fixed CS. This closes #1731


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

Branch: refs/heads/camel-2.19.x
Commit: 796f056b9974fd49c27f68ee46b5dfd32e56730a
Parents: e0d6078
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 1 09:11:25 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:12:02 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/796f056b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 0af07d2..f5da95f 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,7 +182,7 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        if(document != null) {
+        if (document != null) {
             ContentStream contentStream = document.getContentStream();
             if (contentStream != null) {
                 return contentStream.getStream();


[05/10] camel git commit: Update CMISSessionFacade.java

Posted by da...@apache.org.
Update CMISSessionFacade.java

Fixing possible null-pointer of document variable.

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

Branch: refs/heads/camel-2.19.x
Commit: e0d607825a6421a3166b8a300b120658544738a7
Parents: 5f734e8
Author: Tomáš Burian <to...@lundegaard.eu>
Authored: Wed May 31 17:03:22 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:11:55 2017 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/cmis/CMISSessionFacade.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e0d60782/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index d143d7c..0af07d2 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,9 +182,11 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        ContentStream contentStream = document.getContentStream();
-        if (document != null && contentStream != null) {
-            return contentStream.getStream();
+        if(document != null) {
+            ContentStream contentStream = document.getContentStream();
+            if (contentStream != null) {
+                return contentStream.getStream();
+            }
         }
         return null;
     }


[07/10] camel git commit: Update CMISSessionFacade.java

Posted by da...@apache.org.
Update CMISSessionFacade.java

Hi, this piece of code causes two calls in a row for content stream. Result of document.getContentStream() has to be stored and used where is needed, not to call document.getContentStream() in condition and than again in return statement.

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

Branch: refs/heads/camel-2.18.x
Commit: 94d4881acd6ded66f02c7df003bdee65d6f59fa4
Parents: 121a834
Author: Tomáš Burian <to...@lundegaard.eu>
Authored: Wed May 31 15:06:01 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:12:18 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/94d4881a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 7b47e69..d143d7c 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,8 +182,9 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        if (document != null && document.getContentStream() != null) {
-            return document.getContentStream().getStream();
+        ContentStream contentStream = document.getContentStream();
+        if (document != null && contentStream != null) {
+            return contentStream.getStream();
         }
         return null;
     }


[03/10] camel git commit: Fixed CS. This closes #1731

Posted by da...@apache.org.
Fixed CS. This closes #1731


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

Branch: refs/heads/master
Commit: 7aa57abb7980e2fd49ce9479e7633fbde321ab3e
Parents: 743d855
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 1 09:11:25 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:11:25 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7aa57abb/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 0af07d2..f5da95f 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,7 +182,7 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        if(document != null) {
+        if (document != null) {
             ContentStream contentStream = document.getContentStream();
             if (contentStream != null) {
                 return contentStream.getStream();


[02/10] camel git commit: Update CMISSessionFacade.java

Posted by da...@apache.org.
Update CMISSessionFacade.java

Hi, this piece of code causes two calls in a row for content stream. Result of document.getContentStream() has to be stored and used where is needed, not to call document.getContentStream() in condition and than again in return statement.

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

Branch: refs/heads/master
Commit: 1fbb5b85b0669c5ac6c17c2e74be68e37a1daf9c
Parents: 6c1c816
Author: Tomáš Burian <to...@lundegaard.eu>
Authored: Wed May 31 15:06:01 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:09:41 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cmis/CMISSessionFacade.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1fbb5b85/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 7b47e69..d143d7c 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,8 +182,9 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        if (document != null && document.getContentStream() != null) {
-            return document.getContentStream().getStream();
+        ContentStream contentStream = document.getContentStream();
+        if (document != null && contentStream != null) {
+            return contentStream.getStream();
         }
         return null;
     }


[08/10] camel git commit: Update CMISSessionFacade.java

Posted by da...@apache.org.
Update CMISSessionFacade.java

Fixing possible null-pointer of document variable.

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

Branch: refs/heads/camel-2.18.x
Commit: 8c6ae74fdcc7d411e60a5e4d4d586ce18ded827d
Parents: 94d4881
Author: Tomáš Burian <to...@lundegaard.eu>
Authored: Wed May 31 17:03:22 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 1 09:12:25 2017 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/cmis/CMISSessionFacade.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8c6ae74f/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index d143d7c..0af07d2 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -182,9 +182,11 @@ public class CMISSessionFacade {
 
     public InputStream getContentStreamFor(QueryResult item) {
         Document document = getDocument(item);
-        ContentStream contentStream = document.getContentStream();
-        if (document != null && contentStream != null) {
-            return contentStream.getStream();
+        if(document != null) {
+            ContentStream contentStream = document.getContentStream();
+            if (contentStream != null) {
+                return contentStream.getStream();
+            }
         }
         return null;
     }