Merge pull request #8 from red5pro/develop

Develop

Author: bustardcelly

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.infrared5.rtmpbee</groupId>
     <artifactId>rtmpbee</artifactId>
-    <version>3.0.0-RELEASE</version>
+    <version>3.1.0-RELEASE</version>
     <packaging>jar</packaging>
     <name>rtmpbee</name>
     <url>http://infrared5.com</url>

src/main/java/com/infrared5/rtmpbee/Red5Bee.java

@@ -166,9 +166,9 @@ public void OnBulletComplete() {
 
     @Override
     public void OnBulletFireFail() {
-        System.out.println("Failure for bullet to fire. Possible missing endpoint. Accessing a new endpoint from stream manager.");
         // If is an streammanager-based call, we may need to re-access on a test where the server went down.
         if (this.streamManagerURL != null) {
+        	System.out.println("Failure for bullet to fire. Possible missing endpoint. Accessing a new endpoint from stream manager.");
             try {
                 modifyEndpointProperties(this.streamManagerURL);
                 // build a bullet
@@ -182,6 +182,13 @@ public void OnBulletFireFail() {
                 e.printStackTrace();
             }
         }
+        else {
+        	int remaining = bulletsRemaining.decrementAndGet();
+            if (remaining <= 0) {
+                System.out.println("All bullets expended. Bye Bye.");
+                System.exit(1);
+            }
+        }
     }
 
     /**
@@ -269,7 +276,8 @@ else if (args.length >= 3 && args.length <= 4) {
         else if (args.length < 5) {
             System.out.printf("Incorrect number of args, please pass in the following: \n  " + "\narg[0] = IP Address" + "\narg[1] = port" + "\narg[2] = app" + "\narg[3] = streamName" + "\narg[4] = numBullets");
             return;
-        } else {
+        }
+        else {
             System.out.println("Determined its an original attack...");
             url = args[0];
             port = Integer.parseInt(args[1]);