Repository: marmotta
Updated Branches:
  refs/heads/develop 68c9cce46 -> df0a65f71


simplified backends' profiles, moving Ostrich (MARMOTTA-621) into the 
experimental ones


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/3b133278
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3b133278
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3b133278

Branch: refs/heads/develop
Commit: 3b1332785a5bfcbc53b7840604ccac8dae7bef7b
Parents: 68c9cce
Author: Sergio Fernández <[email protected]>
Authored: Tue May 3 11:55:35 2016 +0200
Committer: Sergio Fernández <[email protected]>
Committed: Tue May 3 11:55:35 2016 +0200

----------------------------------------------------------------------
 .../platform/backend/ostrich/OstrichSailRepository.java       | 4 +++-
 platform/backends/pom.xml                                     | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/3b133278/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
----------------------------------------------------------------------
diff --git 
a/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
 
b/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
index 684ae5b..5952154 100644
--- 
a/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
+++ 
b/platform/backends/marmotta-backend-ostrich/src/main/java/org/apache/marmotta/platform/backend/ostrich/OstrichSailRepository.java
@@ -162,7 +162,9 @@ public class OstrichSailRepository extends SailRepository {
             return (OstrichSailConnection)current;
         } else if (current instanceof SailConnectionWrapper) {
             return findConnection(((SailConnectionWrapper) 
current).getWrappedConnection());
+        } else {
+            return null;
         }
-        return null;
     }
+
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/3b133278/platform/backends/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/pom.xml b/platform/backends/pom.xml
index 766d1b3..ecc5375 100644
--- a/platform/backends/pom.xml
+++ b/platform/backends/pom.xml
@@ -80,16 +80,11 @@
             </modules>
         </profile>
         <profile>
-            <id>ostrich</id>
-            <modules>
-                <module>marmotta-backend-ostrich</module>
-            </modules>
-        </profile>
-        <profile>
             <id>experimental</id>
             <modules>
                 <module>marmotta-backend-http</module>
                 <module>marmotta-backend-sparql</module>
+                <module>marmotta-backend-ostrich</module>
             </modules>
         </profile>
     </profiles>

Reply via email to