Revision 44851 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultExpressionEvaluatorManager.java

View differences:

DefaultExpressionEvaluatorManager.java
1 1
package org.gvsig.expressionevaluator.impl;
2 2

  
3
import java.io.InputStream;
3 4
import java.io.StringWriter;
4 5
import java.net.URI;
5 6
import java.util.ArrayList;
......
383 384
            if( res == null || !res.exists() ) {
384 385
                return null;
385 386
            }
386
            byte[] head_bytes = new byte[500];
387
            IOUtils.read(res.asInputStream(), head_bytes);
388
            IOUtils.closeQuietly(res);
389
            String head = new String(head_bytes);
387
            String head = EncodingUtils.getFirstLine(res.asInputStream());
388
            IOUtils.closeQuietly(res); // Eliminar con org.gvsig.tools > 3.0.230
390 389
            if( StringUtils.isEmpty(head) ) {
391 390
                return null;
392 391
            }
393
            head = StringUtils.split(head, "\n")[0];
394 392
            
393
            String encoding = EncodingUtils.getEncoding(head);
394
            
395 395
            String lang = "cosa";
396
            String encoding = null;
397 396
            Matcher m = RE_LANG.matcher(head);
398 397
            if( m!=null && m.matches() && m.groupCount()==1 ) {
399 398
                String s = m.group(1);
......
401 400
                    lang = s;
402 401
                }
403 402
            }
404
            m = RE_ENCODING.matcher(head);
405
            if( m!=null && m.matches() && m.groupCount()==1 ) {
406
                String s = m.group(1);
407
                if( !StringUtils.isBlank(s) ) {
408
                    encoding = s;
409
                }
410
            }
411

  
412 403
            String source;
413 404
            if( StringUtils.isBlank(encoding) ) {
414 405
                source = IOUtils.toString(res.asInputStream());

Also available in: Unified diff