Author: rwesten
Date: Tue Apr 15 13:17:47 2014
New Revision: 1587574
URL: http://svn.apache.org/r1587574
Log:
merged fix for STANBOL-1315 to trunk
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/enhancer/ (props changed)
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
stanbol/trunk/integration-tests/ (props changed)
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1587573
Propchange: stanbol/trunk/enhancer/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/enhancer:r1587573
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java?rev=1587574&r1=1587573&r2=1587574&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
Tue Apr 15 13:17:47 2014
@@ -402,7 +402,7 @@ public class ContentItemWriter implement
Set<MediaType> includeMediaTypes = new
HashSet<MediaType>(includeMediaTypeStrings.size());
for(String includeString : includeMediaTypeStrings){
if(includeString != null){
- includeString.trim();
+ includeString = includeString.trim();
if(!includeString.isEmpty()){
if("*".equals(includeString)){ //also support '*' for '*/*'
includeMediaTypes.add(WILDCARD_TYPE);
Propchange: stanbol/trunk/integration-tests/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/integration-tests:r1587573
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java?rev=1587574&r1=1587573&r2=1587574&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
Tue Apr 15 13:17:47 2014
@@ -295,7 +295,6 @@ public abstract class MultiThreadedTestB
private String getNext(){
if(it == null){
UriRef property;
- propertyString.trim();
if("*".equals(propertyString)){
property = null; //wildcard
log.info("Iterate over values of all Triples");
@@ -507,7 +506,7 @@ public abstract class MultiThreadedTestB
if(propertyString == null || propertyString.isEmpty()){
this.propertyString = DEFAULT_TEST_DATA_PROPERTY;
} else {
- this.propertyString = propertyString;
+ this.propertyString = propertyString.trim();
}
}
public String getContentProperty() {
