You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/04/19 13:57:54 UTC
[1/2] cxf git commit: using a diff operator in JavaScript type checks,
patch from jlast applied, This closes #127
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes a3e300f5f -> 7f771258b
using a diff operator in JavaScript type checks, patch from jlast applied, This closes #127
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e639ef25
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e639ef25
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e639ef25
Branch: refs/heads/3.0.x-fixes
Commit: e639ef25dfc5c6202f312a60f9731db07adaf5ad
Parents: a3e300f
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Apr 19 12:21:27 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Apr 19 12:25:25 2016 +0100
----------------------------------------------------------------------
.../org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e639ef25/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
index f13a51d..04d014c 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
@@ -304,7 +304,7 @@ public class SchemaJavascriptBuilder {
code.append("//\n");
code.append("function " + functionName + "(cxfjsutils, elementName, extraNamespaces) {\n");
utils.startXmlStringAccumulator("xml");
- utils.startIf("elementName != null");
+ utils.startIf("elementName !== null");
utils.appendString("<");
utils.appendExpression("elementName");
// now add any accumulated namespaces.
@@ -321,7 +321,7 @@ public class SchemaJavascriptBuilder {
utils.appendString(">");
utils.endBlock();
code.append(bodyCode);
- utils.startIf("elementName != null");
+ utils.startIf("elementName !== null");
utils.appendString("</");
utils.appendExpression("elementName");
utils.appendString(">");
[2/2] cxf git commit: [CXF-6868] Returning null if Authorization is
empty
Posted by se...@apache.org.
[CXF-6868] Returning null if Authorization is empty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f771258
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f771258
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f771258
Branch: refs/heads/3.0.x-fixes
Commit: 7f771258b6325e5e18eecd57f7fdf280056f44cc
Parents: e639ef2
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Apr 19 12:55:58 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Apr 19 12:57:30 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/cxf/transport/http/Headers.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f771258/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index bd8e3db..5f61dd2 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -529,11 +529,12 @@ public class Headers {
public String getAuthorization() {
if (headers.containsKey("Authorization")) {
- List<String> authorizationLines = headers.get("Authorization");
- return authorizationLines.get(0);
- } else {
- return null;
- }
+ List<String> authorizationLines = headers.get("Authorization");
+ if (authorizationLines != null && !authorizationLines.isEmpty()) {
+ return authorizationLines.get(0);
+ }
+ }
+ return null;
}
public static SimpleDateFormat getHttpDateFormat() {