litesoft
Diff Revisions
803
vs
804
for /trunk/Java/core/Server/src/org/litesoft/peertopeer/nonpublic/peermanagement/PeerConnectionManager.java
|
@@ -6,10 +6,10 @@ |
6 |
6 |
|
import java.util.*; |
7 |
7 |
|
import java.util.concurrent.*; |
8 |
8 |
|
|
|
9 |
+ |
import org.litesoft.core.typeutils.*; |
9 |
10 |
|
import org.litesoft.logger.*; |
10 |
11 |
|
import org.litesoft.peertopeer.*; |
11 |
12 |
|
import org.litesoft.peertopeer.nonpublic.*; |
12 |
|
- |
import org.litesoft.util.*; |
13 |
13 |
|
|
14 |
14 |
|
public class PeerConnectionManager implements P2PConstants |
15 |
15 |
|
{ |
|
@@ -27,9 +27,9 @@ |
27 |
27 |
|
|
28 |
28 |
|
public PeerConnectionManager( MessageFromPeerHandlerManager pMessageFromPeerHandlerManager, PeerManager pPeerManager, boolean pOKtoRunIfIncompatibleVersionAlreadyRunning ) |
29 |
29 |
|
{ |
30 |
|
- |
Utils.assertNotNull( "MessageFromPeerHandlerManager", // |
31 |
|
- |
mMessageFromPeerHandlerManager = pMessageFromPeerHandlerManager ); |
32 |
|
- |
Utils.assertNotNull( "PeerManager", mPeerManager = pPeerManager ); |
|
30 |
+ |
Objects.assertNotNull( "MessageFromPeerHandlerManager", // |
|
31 |
+ |
mMessageFromPeerHandlerManager = pMessageFromPeerHandlerManager ); |
|
32 |
+ |
Objects.assertNotNull( "PeerManager", mPeerManager = pPeerManager ); |
33 |
33 |
|
mOKtoRunIfIncompatibleVersionAlreadyRunning = pOKtoRunIfIncompatibleVersionAlreadyRunning; |
34 |
34 |
|
} |
35 |
35 |
|
|
|
@@ -40,7 +40,7 @@ |
40 |
40 |
|
|
41 |
41 |
|
public synchronized void setOurConnectionInfo( String pOurName, InetAddress pOurServerAddress, int pOurServerPort ) |
42 |
42 |
|
{ |
43 |
|
- |
Utils.assertNotNull( "OurServerAddress", pOurServerAddress ); |
|
43 |
+ |
Objects.assertNotNull( "OurServerAddress", pOurServerAddress ); |
44 |
44 |
|
if ( mOurDefinition != null ) |
45 |
45 |
|
{ |
46 |
46 |
|
throw new IllegalStateException( "setOurConnectionInfo() already called with: " + mOurDefinition ); |