Merge branch 'master' of https://github.com/js-labs/js-collider

js-labs · js-labs · commit 06f8f8887eb1 · 2015-12-05T11:29:37.000+03:00
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
                      JS-Collider
                      ===========
 
+[![Join the chat at https://gitter.im/js-labs/js-collider](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/js-labs/js-collider?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
                        +-----+
                  /-----|     |-----\        +---+ 
                 /      |     |      <=======|A/C| Session emitters
diff --git a/src/main/java/org/jsl/collider/StreamDefragger.java b/src/main/java/org/jsl/collider/StreamDefragger.java
@@ -61,7 +61,7 @@
  *
  *       public void onConnectionClose()
  *       {
- *           streamDefragger.reset();
+ *           streamDefragger.close();
  *       }
  *   }
  * }</pre>
@@ -231,7 +231,7 @@ else if (!m_buf.releaseReuse())
         return m_data;
     }
 
-    public void reset()
+    public void close()
     {
         if (m_buf != null)
         {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`*`
`62`	`62`	`* public void onConnectionClose()`
`63`	`63`	`* {`
`64`		`- * streamDefragger.reset();`
	`64`	`+ * streamDefragger.close();`
`65`	`65`	`* }`
`66`	`66`	`* }`
`67`	`67`	`* }</pre>`
`@@ -231,7 +231,7 @@ else if (!m_buf.releaseReuse())`
`231`	`231`	`return m_data;`
`232`	`232`	`}`
`233`	`233`
`234`		`- public void reset()`
	`234`	`+ public void close()`
`235`	`235`	`{`
`236`	`236`	`if (m_buf != null)`
`237`	`237`	`{`