sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-3.1'
Date Tue, 04 Jun 2019 16:30:41 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit fee544d3a7d14e626c9fdea5c63734320e5c8e00
Merge: 7e0dc41 2b44b0c
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jun 4 18:29:57 2019 +0200

    Merge branch 'geoapi-3.1'

 .../org/apache/sis/console/AboutCommandTest.java    |  8 +++-----
 .../java/org/apache/sis/console/CRSCommandTest.java |  7 +++++--
 .../apache/sis/coverage/grid/GridDerivation.java    | 12 +++++++++++-
 .../org/apache/sis/metadata/InformationMap.java     | 14 +++++++++++---
 .../org/apache/sis/metadata/MetadataStandard.java   |  6 +++---
 .../org/apache/sis/metadata/PropertyAccessor.java   | 21 +++++++--------------
 .../java/org/apache/sis/metadata/SpecialCases.java  |  6 ++----
 .../apache/sis/metadata/PropertyAccessorTest.java   | 18 +++++++++---------
 .../sis/metadata/PropertyConsistencyCheck.java      |  4 ++--
 .../org/apache/sis/metadata/SpecialCasesTest.java   |  8 ++++----
 .../main/java/org/apache/sis/storage/DataStore.java | 14 ++++++++++++--
 .../org/apache/sis/internal/storage/gpx/Store.java  |  4 +---
 12 files changed, 70 insertions(+), 52 deletions(-)

diff --cc storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
index 7e0b2ee,1e20adf..80ed926
--- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
+++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
@@@ -239,9 -239,7 +239,7 @@@ public final class Store extends StaxDa
       * @throws ConcurrentReadException if the {@code features} stream was provided by this
data store.
       * @throws DataStoreException if an error occurred while writing the data.
       */
-     public synchronized void write(final Metadata metadata, final Stream<? extends AbstractFeature>
features)
-             throws DataStoreException
-     {
 -    public synchronized void write(final Metadata metadata, final Stream<? extends Feature>
features) throws DataStoreException {
++    public synchronized void write(final Metadata metadata, final Stream<? extends AbstractFeature>
features) throws DataStoreException {
          try {
              /*
               * If we created a reader for reading metadata, we need to close that reader
now otherwise the call


Mime
View raw message