You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ng...@apache.org on 2009/08/03 21:20:40 UTC
svn commit: r800501 -
/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Author: ngallardo
Date: Mon Aug 3 19:20:40 2009
New Revision: 800501
URL: http://svn.apache.org/viewvc?rev=800501&view=rev
Log:
Changes for [WINK-124]. Don't add empty strings to the list of http method override keys.
Modified:
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=800501&r1=800500&r2=800501&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Mon Aug 3 19:20:40 2009
@@ -120,11 +120,15 @@
if (properties == null) {
properties = new Properties();
}
+
+ // check to see if an override property was specified. if so, then configure
+ // the headers from there using a comma delimited string.
String httpMethodOverrideHeadersProperty =
properties.getProperty(HTTP_METHOD_OVERRIDE_HEADERS_PROP);
httpMethodOverrideHeaders =
- httpMethodOverrideHeadersProperty != null ? httpMethodOverrideHeadersProperty
- .split(",") : null;
+ (httpMethodOverrideHeadersProperty != null && httpMethodOverrideHeadersProperty.length() > 0)
+ ? httpMethodOverrideHeadersProperty.split(",") : null;
+
initRegistries();
initAlternateShortcutMap();
initMediaTypeMapper();
RE: svn commit: r800501 - /incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Posted by Nicholas L Gallardo <nl...@us.ibm.com>.
Martin, no worries at all. Thanks for the heads up.
-N
Nicholas Gallardo
WebSphere - REST & WebServices Development
nlgallar@us.ibm.com
Phone: 512-286-6258
Building: 903 / 5G-016
"Snitkovsky,
Martin"
<martin.snitkovsk To
y@hp.com> "wink-dev@incubator.apache.org"
<wi...@incubator.apache.org>,
08/03/2009 02:45 "ngallardo@apache.org"
PM <ng...@apache.org>
cc
Please respond to Subject
wink-dev@incubato RE: svn commit: r800501
r.apache.org - /incubator/wink/trunk/wink-server
/src/main/java/org/apache/wink/serv
er/internal/DeploymentConfiguration
.java
Hi Nick,
You committed your changes to trunk which was 0.2 snapshot (i was I the
middle of testing release process that changed snapshot version).
I have just done testing release process and now truck is back 0.1 ...
meaning - you will need to apply your changes again.
Sorry for inconvenience,
martin
-----Original Message-----
From: ngallardo@apache.org [mailto:ngallardo@apache.org]
Sent: Monday, August 03, 2009 10:21 PM
To: wink-commits@incubator.apache.org
Subject: svn commit: r800501
- /incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Author: ngallardo
Date: Mon Aug 3 19:20:40 2009
New Revision: 800501
URL: http://svn.apache.org/viewvc?rev=800501&view=rev
Log:
Changes for [WINK-124]. Don't add empty strings to the list of http method
override keys.
Modified:
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Modified:
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=800501&r1=800500&r2=800501&view=diff
==============================================================================
---
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
(original)
+++
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Mon Aug 3 19:20:40 2009
@@ -120,11 +120,15 @@
if (properties == null) {
properties = new Properties();
}
+
+ // check to see if an override property was specified. if so,
then configure
+ // the headers from there using a comma delimited string.
String httpMethodOverrideHeadersProperty =
properties.getProperty(HTTP_METHOD_OVERRIDE_HEADERS_PROP);
httpMethodOverrideHeaders =
- httpMethodOverrideHeadersProperty != null ?
httpMethodOverrideHeadersProperty
- .split(",") : null;
+ (httpMethodOverrideHeadersProperty != null &&
httpMethodOverrideHeadersProperty.length() > 0)
+ ? httpMethodOverrideHeadersProperty.split(",") : null;
+
initRegistries();
initAlternateShortcutMap();
initMediaTypeMapper();
RE: svn commit: r800501 -
/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Posted by "Snitkovsky, Martin" <ma...@hp.com>.
Hi Nick,
You committed your changes to trunk which was 0.2 snapshot (i was I the middle of testing release process that changed snapshot version).
I have just done testing release process and now truck is back 0.1 ... meaning - you will need to apply your changes again.
Sorry for inconvenience,
martin
-----Original Message-----
From: ngallardo@apache.org [mailto:ngallardo@apache.org]
Sent: Monday, August 03, 2009 10:21 PM
To: wink-commits@incubator.apache.org
Subject: svn commit: r800501 - /incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Author: ngallardo
Date: Mon Aug 3 19:20:40 2009
New Revision: 800501
URL: http://svn.apache.org/viewvc?rev=800501&view=rev
Log:
Changes for [WINK-124]. Don't add empty strings to the list of http method override keys.
Modified:
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=800501&r1=800500&r2=800501&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Mon Aug 3 19:20:40 2009
@@ -120,11 +120,15 @@
if (properties == null) {
properties = new Properties();
}
+
+ // check to see if an override property was specified. if so, then configure
+ // the headers from there using a comma delimited string.
String httpMethodOverrideHeadersProperty =
properties.getProperty(HTTP_METHOD_OVERRIDE_HEADERS_PROP);
httpMethodOverrideHeaders =
- httpMethodOverrideHeadersProperty != null ? httpMethodOverrideHeadersProperty
- .split(",") : null;
+ (httpMethodOverrideHeadersProperty != null && httpMethodOverrideHeadersProperty.length() > 0)
+ ? httpMethodOverrideHeadersProperty.split(",") : null;
+
initRegistries();
initAlternateShortcutMap();
initMediaTypeMapper();