clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/InfinispanBeanManager.java

@@ -190,8 +190,15 @@ public void stop() {
     }
 
     @Override
-    public boolean isRemotable(Throwable throwable) {
-        return !(throwable instanceof CacheException);
+    public boolean isRemotable(final Throwable throwable) {
+        Throwable subject = throwable;
+        while (subject != null) {
+            if (subject instanceof CacheException) {
+                return false;
+            }
+            subject = subject.getCause();
+        }
+        return true;
     }
 
     @Override

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheConfigurationServiceConfigurator.java

@@ -34,6 +34,7 @@
 import org.infinispan.configuration.cache.LockingConfiguration;
 import org.infinispan.configuration.cache.MemoryConfiguration;
 import org.infinispan.configuration.cache.PersistenceConfiguration;
+import org.infinispan.configuration.cache.StorageType;
 import org.infinispan.configuration.cache.TransactionConfiguration;
 import org.infinispan.distribution.group.Grouper;
 import org.jboss.as.clustering.controller.CapabilityServiceNameProvider;
@@ -81,9 +82,11 @@
         String containerName = address.getParent().getLastElement().getValue();
         String cacheName = address.getLastElement().getValue();
         this.configurator = new ConfigurationServiceConfigurator(this.getServiceName(), containerName, cacheName, this.andThen(builder -> {
-            GroupsConfigurationBuilder groupsBuilder = builder.clustering().hash().groups().enabled();
-            for (Grouper<?> grouper : this.module.get().loadService(Grouper.class)) {
-                groupsBuilder.addGrouper(grouper);
+            if (builder.memory().storageType() == StorageType.OBJECT) {
+                GroupsConfigurationBuilder groupsBuilder = builder.clustering().hash().groups().enabled();
+                for (Grouper<?> grouper : this.module.get().loadService(Grouper.class)) {
+                    groupsBuilder.addGrouper(grouper);
+                }
             }
         })).require(this);
     }

clustering/server/src/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactory.java

@@ -264,7 +264,7 @@ public void viewAccepted(View view) {
                 this.members.keySet().removeAll(leftMembers);
             }
 
-            if (this.listeners.isEmpty()) {
+            if (!this.listeners.isEmpty()) {
                 Address localAddress = this.dispatcher.getChannel().getAddress();
                 ViewMembership oldMembership = new ViewMembership(localAddress, oldView, this);
                 ViewMembership membership = new ViewMembership(localAddress, view, this);

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SessionCreationMetaDataEntryExternalizer.java

@@ -30,7 +30,6 @@
 
 import org.kohsuke.MetaInfServices;
 import org.wildfly.clustering.marshalling.Externalizer;
-import org.wildfly.clustering.marshalling.spi.DefaultExternalizer;
 import org.wildfly.clustering.marshalling.spi.IndexSerializer;
 
 /**
@@ -43,13 +42,14 @@
     @Override
     public void writeObject(ObjectOutput output, SessionCreationMetaDataEntry<Object> entry) throws IOException {
         SessionCreationMetaData metaData = entry.getMetaData();
-        DefaultExternalizer.INSTANT.cast(Instant.class).writeObject(output, metaData.getCreationTime());
+        // We only need millisecond precision
+        output.writeLong(metaData.getCreationTime().toEpochMilli());
         IndexSerializer.VARIABLE.writeInt(output, (int) metaData.getMaxInactiveInterval().getSeconds());
     }
 
     @Override
     public SessionCreationMetaDataEntry<Object> readObject(ObjectInput input) throws IOException, ClassNotFoundException {
-        SessionCreationMetaData metaData = new SimpleSessionCreationMetaData(DefaultExternalizer.INSTANT.cast(Instant.class).readObject(input));
+        SessionCreationMetaData metaData = new SimpleSessionCreationMetaData(Instant.ofEpochMilli(input.readLong()));
         metaData.setMaxInactiveInterval(Duration.ofSeconds(IndexSerializer.VARIABLE.readInt(input)));
         return new SessionCreationMetaDataEntry<>(metaData);
     }

clustering/web/infinispan/src/test/java/org/wildfly/clustering/web/infinispan/session/SessionCreationMetaDataEntryExternalizerTestCase.java

@@ -46,7 +46,8 @@ public void test() throws ClassNotFoundException, IOException {
     }
 
     static void assertEquals(SessionCreationMetaDataEntry<Object> entry1, SessionCreationMetaDataEntry<Object> entry2) {
-        Assert.assertEquals(entry1.getMetaData().getCreationTime(), entry2.getMetaData().getCreationTime());
+        // Compare only to millisecond precision
+        Assert.assertEquals(entry1.getMetaData().getCreationTime().toEpochMilli(), entry2.getMetaData().getCreationTime().toEpochMilli());
         Assert.assertEquals(entry1.getMetaData().getMaxInactiveInterval(), entry2.getMetaData().getMaxInactiveInterval());
     }
 }

connector/src/main/java/org/jboss/as/connector/deployers/datasource/DataSourceDefinitionInjectionSource.java

@@ -261,6 +261,7 @@ private void startDataSource(final AbstractDataSourceService dataSourceService,
                 .addService(bindInfo.getBinderServiceName(), binderService)
                 .addDependency(referenceFactoryServiceName, ManagedReferenceFactory.class, binderService.getManagedObjectInjector())
                 .addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class, binderService.getNamingStoreInjector()).addListener(new LifecycleListener() {
+                    private volatile boolean bound;
                     public void handleEvent(final ServiceController<?> controller, final LifecycleEvent event) {
                         switch (event) {
                             case UP: {
@@ -269,13 +270,16 @@ public void handleEvent(final ServiceController<?> controller, final LifecycleEv
                                 } else {
                                     SUBSYSTEM_DATASOURCES_LOGGER.boundNonJTADataSource(jndiName);
                                 }
+                                bound = true;
                                 break;
                             }
                             case DOWN: {
-                                if (isTransactional()) {
-                                    SUBSYSTEM_DATASOURCES_LOGGER.unboundDataSource(jndiName);
-                                } else {
-                                    SUBSYSTEM_DATASOURCES_LOGGER.unBoundNonJTADataSource(jndiName);
+                                if (bound) {
+                                    if (isTransactional()) {
+                                        SUBSYSTEM_DATASOURCES_LOGGER.unboundDataSource(jndiName);
+                                    } else {
+                                        SUBSYSTEM_DATASOURCES_LOGGER.unBoundNonJTADataSource(jndiName);
+                                    }
                                 }
                                 break;
                             }

connector/src/main/java/org/jboss/as/connector/deployers/ds/processors/DriverProcessor.java

@@ -58,6 +58,7 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
         if (module != null && servicesAttachment != null) {
             final ModuleClassLoader classLoader = module.getClassLoader();
             final List<String> driverNames = servicesAttachment.getServiceImplementations(Driver.class.getName());
+            int idx = 0;
             for (String driverClassName : driverNames) {
                 try {
                     final Class<? extends Driver> driverClass = classLoader.loadClass(driverClassName).asSubclass(Driver.class);
@@ -86,6 +87,18 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
                             .addDependency(ConnectorServices.JDBC_DRIVER_REGISTRY_SERVICE, DriverRegistry.class,
                                     driverService.getDriverRegistryServiceInjector()).setInitialMode(Mode.ACTIVE).install();
 
+                    if (idx == 0 && driverNames.size() != 1) {
+                        // create short name driver service
+                        driverName = deploymentUnit.getName(); // reset driverName to the deployment unit name
+                        driverMetadata = new InstalledDriver(driverName, driverClass.getName(), null,
+                                null, majorVersion, minorVersion, compliant);
+                        driverService = new DriverService(driverMetadata, driver);
+                        phaseContext.getServiceTarget()
+                                .addService(ServiceName.JBOSS.append("jdbc-driver", driverName.replaceAll("\\.", "_")), driverService)
+                                .addDependency(ConnectorServices.JDBC_DRIVER_REGISTRY_SERVICE, DriverRegistry.class, driverService.getDriverRegistryServiceInjector())
+                                .setInitialMode(Mode.ACTIVE).install();
+                    }
+                    idx++;
                 } catch (Throwable e) {
                     DEPLOYER_JDBC_LOGGER.cannotInstantiateDriverClass(driverClassName, e);
                 }

connector/src/main/java/org/jboss/as/connector/deployers/ds/processors/DsXmlDeploymentInstallProcessor.java

@@ -363,6 +363,7 @@ private void startDataSource(final AbstractDataSourceService dataSourceService,
                 .addService(bindInfo.getBinderServiceName(), binderService)
                 .addDependency(referenceFactoryServiceName, ManagedReferenceFactory.class, binderService.getManagedObjectInjector())
                 .addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class, binderService.getNamingStoreInjector()).addListener(new LifecycleListener() {
+                    private volatile boolean bound;
                     public void handleEvent(final ServiceController<?> controller, final LifecycleEvent event) {
                         switch (event) {
                             case UP: {
@@ -371,13 +372,16 @@ public void handleEvent(final ServiceController<?> controller, final LifecycleEv
                                 } else {
                                     SUBSYSTEM_DATASOURCES_LOGGER.boundNonJTADataSource(jndiName);
                                 }
+                                bound = true;
                                 break;
                             }
                             case DOWN: {
-                                if (isTransactional) {
-                                    SUBSYSTEM_DATASOURCES_LOGGER.unboundDataSource(jndiName);
-                                } else {
-                                    SUBSYSTEM_DATASOURCES_LOGGER.unBoundNonJTADataSource(jndiName);
+                                if (bound) {
+                                    if (isTransactional) {
+                                        SUBSYSTEM_DATASOURCES_LOGGER.unboundDataSource(jndiName);
+                                    } else {
+                                        SUBSYSTEM_DATASOURCES_LOGGER.unBoundNonJTADataSource(jndiName);
+                                    }
                                 }
                                 break;
                             }

connector/src/main/java/org/jboss/as/connector/deployers/ra/AdministeredObjectDefinitionInjectionSource.java

@@ -100,14 +100,18 @@ public void getResourceValue(final ResolutionContext context, final ServiceBuild
 
         serviceBuilder.addDependency(AdminObjectReferenceFactoryService.SERVICE_NAME_BASE.append(bindInfo.getBinderServiceName()), ManagedReferenceFactory.class, injector);
         serviceBuilder.addListener(new LifecycleListener() {
+            private volatile boolean bound;
             public void handleEvent(final ServiceController<?> controller, final LifecycleEvent event) {
                 switch (event) {
                     case UP: {
                         DEPLOYMENT_CONNECTOR_LOGGER.adminObjectAnnotation(jndiName);
+                        bound = true;
                         break;
                     }
                     case DOWN: {
-                        DEPLOYMENT_CONNECTOR_LOGGER.unboundJca("AdminObject", jndiName);
+                        if (bound) {
+                            DEPLOYMENT_CONNECTOR_LOGGER.unboundJca("AdminObject", jndiName);
+                        }
                         break;
                     }
                     case REMOVED: {

connector/src/main/java/org/jboss/as/connector/services/resourceadapters/deployment/AbstractResourceAdapterDeploymentService.java

@@ -442,14 +442,18 @@ protected AbstractWildFlyRaDeployer(ServiceTarget serviceTarget, URL url, String
                         .addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class,
                                 binderService.getNamingStoreInjector())
                         .addListener(new LifecycleListener() {
+                            private volatile boolean bound;
                             public void handleEvent(final ServiceController<? extends Object> controller, final LifecycleEvent event) {
                                 switch (event) {
                                     case UP: {
                                         DEPLOYMENT_CONNECTOR_LOGGER.boundJca("ConnectionFactory", jndi);
+                                        bound = true;
                                         break;
                                     }
                                     case DOWN: {
-                                        DEPLOYMENT_CONNECTOR_LOGGER.unboundJca("ConnectionFactory", jndi);
+                                        if (bound) {
+                                            DEPLOYMENT_CONNECTOR_LOGGER.unboundJca("ConnectionFactory", jndi);
+                                        }
                                         break;
                                     }
                                     case REMOVED: {
@@ -479,15 +483,19 @@ private void installJNDIAliases(final ContextNames.BindInfo bindInfo, final Serv
                 sb.addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class, aliasBinderService.getNamingStoreInjector());
                 sb.requires(bindInfo.getBinderServiceName());
                 sb.addListener(new LifecycleListener() {
+                            private volatile boolean bound;
                             @Override
                             public void handleEvent(ServiceController<?> controller, LifecycleEvent event) {
                                 switch (event) {
                                     case UP: {
                                         DEPLOYMENT_CONNECTOR_LOGGER.bindingAlias(bindInfo.getAbsoluteJndiName(), alias);
+                                        bound = true;
                                         break;
                                     }
                                     case DOWN: {
-                                        DEPLOYMENT_CONNECTOR_LOGGER.unbindingAlias(bindInfo.getAbsoluteJndiName(), alias);
+                                        if (bound) {
+                                            DEPLOYMENT_CONNECTOR_LOGGER.unbindingAlias(bindInfo.getAbsoluteJndiName(), alias);
+                                        }
                                         break;
                                     }
                                     case REMOVED: {
@@ -539,15 +547,18 @@ public void handleEvent(ServiceController<?> controller, LifecycleEvent event) {
                                 binderService.getManagedObjectInjector())
                         .addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class,
                                 binderService.getNamingStoreInjector()).addListener(new LifecycleListener() {
-
+                    private volatile boolean bound;
                     public void handleEvent(final ServiceController<?> controller, final LifecycleEvent event) {
                         switch (event) {
                             case UP: {
                                 DEPLOYMENT_CONNECTOR_LOGGER.boundJca("AdminObject", jndi);
+                                bound = true;
                                 break;
                             }
                             case DOWN: {
-                                DEPLOYMENT_CONNECTOR_LOGGER.unboundJca("AdminObject", jndi);
+                                if (bound) {
+                                    DEPLOYMENT_CONNECTOR_LOGGER.unboundJca("AdminObject", jndi);
+                                }
                                 break;
                             }
                             case REMOVED: {

connector/src/main/java/org/jboss/as/connector/subsystems/datasources/AbstractDataSourceAdd.java

@@ -418,6 +418,7 @@ static void secondRuntimeStep(OperationContext context, ModelNode operation, Man
                 .addService(bindInfo.getBinderServiceName(), binderService)
                 .addDependency(referenceFactoryServiceName, ManagedReferenceFactory.class, binderService.getManagedObjectInjector())
                 .addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class, binderService.getNamingStoreInjector()).addListener(new LifecycleListener() {
+                    private volatile boolean bound;
                     public void handleEvent(final ServiceController<? extends Object> controller, final LifecycleEvent event) {
                         switch (event) {
                             case UP: {
@@ -426,13 +427,16 @@ public void handleEvent(final ServiceController<? extends Object> controller, fi
                                 } else {
                                     SUBSYSTEM_DATASOURCES_LOGGER.boundNonJTADataSource(jndiName);
                                 }
+                                bound = true;
                                 break;
                             }
                             case DOWN: {
-                                if (jta) {
-                                    SUBSYSTEM_DATASOURCES_LOGGER.unboundDataSource(jndiName);
-                                } else {
-                                    SUBSYSTEM_DATASOURCES_LOGGER.unBoundNonJTADataSource(jndiName);
+                                if (bound) {
+                                    if (jta) {
+                                        SUBSYSTEM_DATASOURCES_LOGGER.unboundDataSource(jndiName);
+                                    } else {
+                                        SUBSYSTEM_DATASOURCES_LOGGER.unBoundNonJTADataSource(jndiName);
+                                    }
                                 }
                                 break;
                             }

connector/src/main/java/org/jboss/as/connector/subsystems/jca/JcaSubsystemRootDefinition.java

@@ -55,8 +55,7 @@ private JcaSubsystemRootDefinition(final boolean registerRuntimeOnly) {
         super(new Parameters(PATH_SUBSYSTEM, JcaExtension.getResourceDescriptionResolver())
                 .setAddHandler(JcaSubsystemAdd.INSTANCE)
                 .setRemoveHandler(JcaSubSystemRemove.INSTANCE)
-                .setCapabilities(JCA_NAMING_CAPABILITY)
-                .setCapabilities(TRANSACTION_INTEGRATION_CAPABILITY)
+                .setCapabilities(JCA_NAMING_CAPABILITY, TRANSACTION_INTEGRATION_CAPABILITY)
         );
         this.registerRuntimeOnly = registerRuntimeOnly;
     }

connector/src/test/java/org/jboss/as/connector/subsystems/jca/JcaSubsystemTestCase.java

@@ -40,6 +40,7 @@
 import org.jboss.as.model.test.ModelTestControllerVersion;
 import org.jboss.as.model.test.ModelTestUtils;
 import org.jboss.as.model.test.SingleClassFilter;
+import org.jboss.as.naming.service.NamingService;
 import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
 import org.jboss.as.subsystem.test.AdditionalInitialization;
 import org.jboss.as.subsystem.test.KernelServices;
@@ -89,6 +90,7 @@ protected AdditionalInitialization createAdditionalInitialization() {
                 ConnectorServices.LOCAL_TRANSACTION_PROVIDER_CAPABILITY,
                 ConnectorServices.TRANSACTION_XA_RESOURCE_RECOVERY_REGISTRY_CAPABILITY,
                 ConnectorServices.TRANSACTION_SYNCHRONIZATION_REGISTRY_CAPABILITY,
+                NamingService.CAPABILITY_NAME,
                 "org.wildfly.threads.thread-factory.string");
     }