Skip to content

Commit 512d2d8

Browse files
ITHitBuildITHitBuild
committed
6.2.9090-Beta
1 parent 88f9e4c commit 512d2d8

File tree

18 files changed

+96
-92
lines changed

18 files changed

+96
-92
lines changed

‎Java/androidfsstorage/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
jarJar {
3535
rules = [
3636
'stax-api-1.0.1.jar' : 'javax.xml.** com.ithit.webdav.xml.@1',
37-
'webdav-server-6.2.9080-Beta.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
37+
'webdav-server-6.2.9090-Beta.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
3838
]
3939
}
4040

@@ -75,11 +75,11 @@ dependencies {
7575
implementation 'commons-io:commons-io:2.7'
7676
implementation 'com.google.code.gson:gson:2.8.9'
7777
implementation 'com.android.support:appcompat-v7:27.1.1'
78-
implementation('com.ithit.webdav.integration:android-integration:6.2.9080-Beta', {
78+
implementation('com.ithit.webdav.integration:android-integration:6.2.9090-Beta', {
7979
exclude group: 'org.nanohttpd', module: 'nanohttpd'
8080
})
8181
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
8282
jarJar 'stax:stax-api:1.0.1'
83-
jarJar 'com.ithit.webdav:webdav-server:6.2.9080-Beta'
83+
jarJar 'com.ithit.webdav:webdav-server:6.2.9090-Beta'
8484
testImplementation 'junit:junit:4.12'
8585
}

‎Java/collectionsync/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>collectionsync</artifactId>
9-
<version>6.2.9080-Beta</version>
9+
<version>6.2.9090-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>com.ithit.webdav.integration</groupId>
3636
<artifactId>servlet-integration</artifactId>
37-
<version>6.2.9080-Beta</version>
37+
<version>6.2.9090-Beta</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>commons-io</groupId>
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>com.ithit.webdav</groupId>
144144
<artifactId>webdav-server</artifactId>
145-
<version>6.2.9080-Beta</version>
145+
<version>6.2.9090-Beta</version>
146146
</dependency>
147147
<dependency>
148148
<groupId>net.java.dev.jna</groupId>
@@ -228,7 +228,7 @@
228228
<server>filesystem</server>
229229
<port>11021</port>
230230
<path>/</path>
231-
<warSourceDirectory>target/collectionsync-6.2.9080-Beta</warSourceDirectory>
231+
<warSourceDirectory>target/collectionsync-6.2.9090-Beta</warSourceDirectory>
232232
</configuration>
233233
</plugin>
234234
<plugin>

‎Java/collectionsync/src/main/java/com/ithit/webdav/samples/collectionsync/FolderImpl.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -438,17 +438,21 @@ public Changes getChanges(List<Property> propNames, String syncToken, boolean de
438438
throw new ServerException(ex);
439439
}
440440

441-
for (Pair<HierarchyItemImpl, Long> item : children.stream().sorted(Comparator.comparingLong(Pair::getRight)).collect(Collectors.toCollection(LinkedHashSet::new))) {
442-
// Don't include deleted files/folders when syncToken is empty, because this is full sync.
443-
if (!(item.getLeft().getChangeType() == Change.DELETED && StringUtil.isNullOrEmpty(syncToken))) {
444-
maxUsn = item.getValue();
445-
if (syncUsn == null || item.getRight() > syncUsn) {
446-
changes.add(item.getLeft());
447-
}
441+
if (limit != null && limit == 0) {
442+
maxUsn = children.stream().mapToLong(Pair::getValue).max().orElse(0);
443+
} else {
444+
for (Pair<HierarchyItemImpl, Long> item : children.stream().sorted(Comparator.comparingLong(Pair::getValue)).collect(Collectors.toCollection(LinkedHashSet::new))) {
445+
// Don't include deleted files/folders when syncToken is empty, because this is full sync.
446+
if (!(item.getLeft().getChangeType() == Change.DELETED && StringUtil.isNullOrEmpty(syncToken))) {
447+
maxUsn = item.getValue();
448+
if (syncUsn == null || item.getValue() > syncUsn) {
449+
changes.add(item.getLeft());
450+
}
448451

449-
if (limit != null && limit == changes.size()) {
450-
changes.setMoreResults(true);
451-
break;
452+
if (limit != null && limit <= changes.size()) {
453+
changes.setMoreResults(true);
454+
break;
455+
}
452456
}
453457
}
454458
}

‎Java/collectionsync/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Java/deltav/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>deltav</artifactId>
9-
<version>6.2.9080-Beta</version>
9+
<version>6.2.9090-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.ithit.webdav.integration</groupId>
2525
<artifactId>servlet-integration</artifactId>
26-
<version>6.2.9080-Beta</version>
26+
<version>6.2.9090-Beta</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.ithit.webdav</groupId>
127127
<artifactId>webdav-server</artifactId>
128-
<version>6.2.9080-Beta</version>
128+
<version>6.2.9090-Beta</version>
129129
</dependency>
130130

131131
<dependency>
@@ -165,7 +165,7 @@
165165
<goal>copy-resources</goal>
166166
</goals>
167167
<configuration>
168-
<outputDirectory>${project.build.directory}/deltav-6.2.9080-Beta/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/deltav-6.2.9090-Beta/META-INF</outputDirectory>
169169
<overwrite>true</overwrite>
170170
<resources>
171171
<resource>
@@ -244,7 +244,7 @@
244244
<server>filesystem</server>
245245
<port>11021</port>
246246
<path>/</path>
247-
<warSourceDirectory>target/deltav-6.2.9080-Beta</warSourceDirectory>
247+
<warSourceDirectory>target/deltav-6.2.9090-Beta</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>

‎Java/deltav/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Java/filesystemstorage/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>filesystemstorage</artifactId>
9-
<version>6.2.9080-Beta</version>
9+
<version>6.2.9090-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>com.ithit.webdav.integration</groupId>
3636
<artifactId>servlet-integration</artifactId>
37-
<version>6.2.9080-Beta</version>
37+
<version>6.2.9090-Beta</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>commons-io</groupId>
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>com.ithit.webdav</groupId>
144144
<artifactId>webdav-server</artifactId>
145-
<version>6.2.9080-Beta</version>
145+
<version>6.2.9090-Beta</version>
146146
</dependency>
147147
<dependency>
148148
<groupId>net.java.dev.jna</groupId>
@@ -228,7 +228,7 @@
228228
<server>filesystem</server>
229229
<port>11021</port>
230230
<path>/</path>
231-
<warSourceDirectory>target/filesystemstorage-6.2.9080-Beta</warSourceDirectory>
231+
<warSourceDirectory>target/filesystemstorage-6.2.9090-Beta</warSourceDirectory>
232232
</configuration>
233233
</plugin>
234234
<plugin>

‎Java/filesystemstorage/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Java/oraclestorage/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>oraclestorage</artifactId>
9-
<version>6.2.9080-Beta</version>
9+
<version>6.2.9090-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.ithit.webdav.integration</groupId>
2525
<artifactId>servlet-integration</artifactId>
26-
<version>6.2.9080-Beta</version>
26+
<version>6.2.9090-Beta</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.ithit.webdav</groupId>
127127
<artifactId>webdav-server</artifactId>
128-
<version>6.2.9080-Beta</version>
128+
<version>6.2.9090-Beta</version>
129129
</dependency>
130130

131131
<dependency>
@@ -165,7 +165,7 @@
165165
<goal>copy-resources</goal>
166166
</goals>
167167
<configuration>
168-
<outputDirectory>${project.build.directory}/oraclestorage-6.2.9080-Beta/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/oraclestorage-6.2.9090-Beta/META-INF</outputDirectory>
169169
<overwrite>true</overwrite>
170170
<resources>
171171
<resource>
@@ -244,7 +244,7 @@
244244
<server>filesystem</server>
245245
<port>11021</port>
246246
<path>/</path>
247-
<warSourceDirectory>target/oraclestorage-6.2.9080-Beta</warSourceDirectory>
247+
<warSourceDirectory>target/oraclestorage-6.2.9090-Beta</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>

‎Java/oraclestorage/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)