Collapse catch blocks in JavaSoundAudioDeviceFactory

bowbahdoe · Oct 20, 2023 · 55c2757 · 55c2757
1 parent 9d099e2
commit 55c2757
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/main/java/dev/mccue/jlayer/player/JavaSoundAudioDeviceFactory.java b/src/main/java/dev/mccue/jlayer/player/JavaSoundAudioDeviceFactory.java
@@ -47,35 +47,26 @@ public synchronized AudioDevice createAudioDevice()
 		{			
 			return createAudioDeviceImpl();
 		}
-		catch (Exception ex)
+		catch (Exception | LinkageError ex)
 		{
 			throw new JavaLayerException("unable to create JavaSound device: " + ex);
 		}
-		catch (LinkageError ex)
-		{
-			throw new JavaLayerException("unable to create JavaSound device: " + ex);
-		}
-	}
+    }
 
 	protected JavaSoundAudioDevice createAudioDeviceImpl()
 		throws JavaLayerException
 	{
 		ClassLoader loader = getClass().getClassLoader();
 		try
 		{
-			JavaSoundAudioDevice dev = (JavaSoundAudioDevice)instantiate(loader, DEVICE_CLASS_NAME);
-			return dev;
-		}
-		catch (Exception ex)
-		{
-			throw new JavaLayerException("Cannot create JavaSound device", ex);
+            return (JavaSoundAudioDevice)instantiate(loader, DEVICE_CLASS_NAME);
 		}
-		catch (LinkageError ex)
+		catch (Exception | LinkageError ex)
 		{
 			throw new JavaLayerException("Cannot create JavaSound device", ex);
 		}
-		
-	}
+
+    }
 
 	public void testAudioDevice() throws JavaLayerException
 	{