unstick r1847921

Revision 1847921

Date:
2018/12/01 20:44:15
Author:
rharo
Revision Log:
Merged PRs for STANBOL-1473 to STANBOL-1476. Kudos to Furkan Karmaci
Files:

Legend:

 
Added
 
Removed
 
Modified
  • stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/IndexMetadata.java

     
    161 161 StringBuilder value = new StringBuilder();
    162 162 boolean first = true;
    163 163 for(String archive:archives){
    164 if(archive != null && archive != null){
    164 if(archive != null){
    165 165 if(!first){
    166 166 value.append(',');
    167 167 } else {
     
    174 174 }
    175 175 public boolean isSynchronized(){
    176 176 String value = getProperty(SYNCHRONIZED);
    177 return value == null ? false : Boolean.parseBoolean(value);
    177 return Boolean.parseBoolean(value);
    178 178 }
    179 179 public void setSynchronized(boolean state){
    180 180 setProperty(SYNCHRONIZED, Boolean.toString(state));
  • stanbol/trunk/commons/testing/jarexec/src/main/java/org/apache/stanbol/commons/testing/jarexec/JarExecutor.java

     
    72 72 return serverPort;
    73 73 }
    74 74
    75 public static JarExecutor getInstance(Properties config) throws ExecutorException {
    75 public synchronized static JarExecutor getInstance(Properties config) throws ExecutorException {
    76 76 if (instance == null) {
    77 synchronized (JarExecutor.class) {
    78 if (instance == null) {
    79 instance = new JarExecutor(config);
    80 }
    81 }
    77 instance = new JarExecutor(config);
    82 78 }
    83 79 return instance;
    84 80 }
  • stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java

     
    206 206 tokens.add(label.substring(offset.startOffset(), offset.endOffset()));
    207 207 }
    208 208 tokenizer.end();
    209 tokenizer.close();
    210 209 } catch (IOException e) {
    211 210 log.error("IOException while reading from a StringReader :(",e);
    212 211 return null;
    212 } finally {
    213 try {
    214 if (tokenizer == null) {
    215 return null;
    216 }
    217 tokenizer.close();
    218 } catch (IOException e) {
    219 log.error("IOException while closing a StringReader :(",e);
    220 return null;
    221 }
    213 222 }
    214 223 return tokens.toArray(new String[tokens.size()]);
    215 224 } else {