Author: david.lloyd(a)jboss.com Date: 2008-12-16 18:39:37 -0500 (Tue, 16 Dec 2008) New Revision: 4758 Modified: remoting3/trunk/build.properties remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java Log: Use XNIO 1.2.0.CR1 Modified: remoting3/trunk/build.properties =================================================================== --- remoting3/trunk/build.properties 2008-12-16 23:07:10 UTC (rev 4757) +++ remoting3/trunk/build.properties 2008-12-16 23:39:37 UTC (rev 4758) @@ -179,8 +179,8 @@ lib.trove.local=${local.repository}/${lib.trove.path} lib.trove.remote=${remote.repository}/${lib.trove.path} -lib.xnio.version=1.2.0.Alpha2008111101 -lib.xnio.version-javadoc=1.2.0.Alpha +lib.xnio.version=1.2.0.CR1 +lib.xnio.version-javadoc=1.2.0.CR1 lib.xnio-api.name=xnio-api-${lib.xnio.version}.jar lib.xnio-api.license=lgpl Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java 2008-12-16 23:07:10 UTC (rev 4757) +++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java 2008-12-16 23:39:37 UTC (rev 4758) @@ -57,6 +57,7 @@ private final Map<Object, ServiceListenerRegistration> serviceListenerMap = CollectionUtil.hashMap(); private final Set<ServiceRegistration> serviceRegistrations = CollectionUtil.hashSet(); + private static final EndpointPermission CREATE_ENDPOINT_PERM = new EndpointPermission("createEndpoint"); private static final EndpointPermission CREATE_REQUEST_HANDLER_PERM = new EndpointPermission("createRequestHandler"); private static final EndpointPermission REGISTER_SERVICE_PERM = new EndpointPermission("registerService"); private static final EndpointPermission CREATE_CLIENT_PERM = new EndpointPermission("createClient"); @@ -66,6 +67,10 @@ public EndpointImpl(final Executor executor, final String name) { super(executor); + final SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(CREATE_ENDPOINT_PERM); + } this.executor = executor; this.name = name; orderedExecutorFactory = new OrderedExecutorFactory(executor);