You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2018/06/14 13:57:42 UTC
[sis] branch JDK8 updated (ddc2472 -> adce7d7)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch JDK8
in repository https://gitbox.apache.org/repos/asf/sis.git.
from ddc2472 Call to Field.setAccessible(true) need to take in account security constrained environment. Call to ModifiableMetadata.freeze() share instances when possible.
new 3ddd715 Portrayal : remove final and extend MapItem on MapLayer class
new adce7d7 Fix a never-ending loop when the file to open has a known extensions but is still not recognized as a known format. This happen in particular with XML files.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/sis/internal/map/MapLayer.java | 2 +-
.../src/main/java/org/apache/sis/storage/DataStoreRegistry.java | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
desruisseaux@apache.org.
[sis] 02/02: Fix a never-ending loop when the file to open has a
known extensions but is still not recognized as a known format. This happen
in particular with XML files.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch JDK8
in repository https://gitbox.apache.org/repos/asf/sis.git
commit adce7d736fcc0af66eda70bd31aab3599a5cf629
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Jun 14 15:56:12 2018 +0200
Fix a never-ending loop when the file to open has a known extensions but is still not recognized as a known format.
This happen in particular with XML files.
---
.../src/main/java/org/apache/sis/storage/DataStoreRegistry.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
index ef81e33..2dc44de 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
@@ -243,11 +243,10 @@ search: do {
/*
* If we filtered providers by the file extension without finding a suitable provider,
* try again with all other providers (even if they are for another file extension).
+ * We do that by changing 'matchCondition' from TRUE to FALSE. In all other cases,
+ * we stop the search.
*/
- if (Boolean.TRUE.equals(matchCondition)) {
- matchCondition = Boolean.FALSE;
- }
- } while (matchCondition != null);
+ } while (matchCondition != null && (matchCondition = !matchCondition) == false);
/*
* If a provider has been found, or if a provider returned UNDETERMINED, use that one
* for opening a DataStore. Note that if more than one provider returned UNDETERMINED,
--
To stop receiving notification emails like this one, please contact
desruisseaux@apache.org.
[sis] 01/02: Portrayal : remove final and extend MapItem on
MapLayer class
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch JDK8
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3ddd7152b4d9543d93c6a8e302314468d52a6da1
Author: Johann Sorel <js...@apache.org>
AuthorDate: Mon Jun 11 14:16:44 2018 +0000
Portrayal : remove final and extend MapItem on MapLayer class
git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1833333 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0d08a3a688b717d96d7635dedd502aa61fc56bab)
---
.../src/main/java/org/apache/sis/internal/map/MapLayer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java
index 8bce881..a2a1fbe 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java
@@ -38,7 +38,7 @@ import org.opengis.style.Style;
* @since 1.0
* @module
*/
-public final class MapLayer {
+public class MapLayer extends MapItem {
/**
* Data to be rendered.
*/
--
To stop receiving notification emails like this one, please contact
desruisseaux@apache.org.