Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3B3F0D7E6 for ; Wed, 1 Aug 2012 11:37:22 +0000 (UTC) Received: (qmail 47660 invoked by uid 500); 1 Aug 2012 11:37:22 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 47621 invoked by uid 500); 1 Aug 2012 11:37:21 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 47607 invoked by uid 99); 1 Aug 2012 11:37:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 11:37:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 11:37:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BE1C22388900 for ; Wed, 1 Aug 2012 11:36:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1367925 - /jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java Date: Wed, 01 Aug 2012 11:36:30 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120801113630.BE1C22388900@eris.apache.org> Author: andy Date: Wed Aug 1 11:36:30 2012 New Revision: 1367925 URL: http://svn.apache.org/viewvc?rev=1367925&view=rev Log: Determine syntax from URI Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java?rev=1367925&r1=1367924&r2=1367925&view=diff ============================================================================== --- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java (original) +++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java Wed Aug 1 11:36:30 2012 @@ -368,7 +368,7 @@ public class FileManager private Model readModelWorker(Model model, String filenameOrURI, String baseURI, String syntax) { - // Doesn't call open() - we want to make the synatx guess based on the mapped URI. + // Doesn't call open() - we want to make the syntax guess based on the mapped URI. String mappedURI = mapURI(filenameOrURI) ; if ( log.isDebugEnabled() && ! mappedURI.equals(filenameOrURI) ) @@ -376,8 +376,9 @@ public class FileManager if ( syntax == null && baseURI == null && mappedURI.startsWith( "http:" ) ) { - // No syntax, no baseURI, HTTP URL ==> use content negotiation - model.read(mappedURI) ; + syntax = FileUtils.guessLang(mappedURI) ; + // Content negotation in next version (FileManager2) + model.read(mappedURI, syntax) ; return model ; }