Skip to content

Commit 7653aae

Browse files
committed
core: remove CompletionHandler
this interface was stolen from Java7. As java7 is required for current release we can simply use original from JDK. Target: trunk Require-book: no Require-notes: no Acked-by: Paul Millar Patch: http://rb.dcache.org/r/5084/
1 parent 87b29c9 commit 7653aae

File tree

6 files changed

+6
-43
lines changed

6 files changed

+6
-43
lines changed

modules/dcache/src/main/java/org/dcache/chimera/nfsv41/mover/NfsExcecutionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import java.io.IOException;
88
import java.net.InetAddress;
99
import java.net.InetSocketAddress;
10+
import java.nio.channels.CompletionHandler;
1011
import java.util.List;
1112
import org.dcache.cells.CellMessageSender;
1213
import org.dcache.chimera.ChimeraFsException;
1314
import org.dcache.chimera.nfs.v4.xdr.stateid4;
1415
import org.dcache.pool.classic.Cancelable;
15-
import org.dcache.pool.classic.CompletionHandler;
1616
import org.dcache.pool.classic.MoverExecutorService;
1717
import org.dcache.pool.classic.PoolIORequest;
1818
import org.dcache.pool.classic.PoolIOTransfer;

modules/dcache/src/main/java/org/dcache/pool/classic/CompletionHandler.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

modules/dcache/src/main/java/org/dcache/pool/classic/LegacyMoverExecutorService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88
import dmg.cells.nucleus.CDC;
9+
import java.nio.channels.CompletionHandler;
910

1011
/**
1112
*

modules/dcache/src/main/java/org/dcache/pool/classic/MoverExecutorService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dcache.pool.classic;
22

3+
import java.nio.channels.CompletionHandler;
4+
35
/**
46
*
57
* @since 1.9.11

modules/dcache/src/main/java/org/dcache/pool/classic/PoolIORequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import dmg.cells.nucleus.CellPath;
1212
import dmg.cells.nucleus.NoRouteToCellException;
1313
import java.io.IOException;
14+
import java.nio.channels.CompletionHandler;
1415
import org.dcache.pool.FaultListener;
1516
import org.slf4j.Logger;
1617
import org.slf4j.LoggerFactory;

modules/dcache/src/main/java/org/dcache/pool/classic/SimpleIoScheduler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424
import dmg.cells.nucleus.CDC;
25+
import java.nio.channels.CompletionHandler;
2526

2627
/**
2728
*

0 commit comments

Comments
 (0)