Merge pull request #58 from foodtiny/README.md

Fix NULL pointer in URL and update mock server in README.md

Author: loint

.gitignore

@@ -20,7 +20,5 @@
 /test.txt
 /logging
 /json
-<<<<<<< HEAD
 /native.iml
-=======
->>>>>>> 1ea982f7691a452fca8baefdc5ac09b6b142a8fc
+

.travis.yml

@@ -13,7 +13,7 @@ before_script:
 - sudo python misc/server.py &
 - cmake . -DCMAKE_BUILD_TYPE=debug -DCMAKE_VERBOSE_MAKEFILE=true
 script:
-- make native_test -j4
+- make native_test -j8
 - make unit-test
 after_script:
 - sudo pkill python

README.md

@@ -1,6 +1,6 @@
 # Native Library
 
-[![Build Status](https://travis-ci.com/foodtiny/native.svg?token=p64HTBqDyw43Lh5iDLxP&branch=master)](https://travis-ci.com/foodtiny/native)
+[![Build Status](https://travis-ci.org/foodtiny/native.svg?token=p64HTBqDyw43Lh5iDLxP&branch=master)](https://travis-ci.com/foodtiny/native)
  [![Support Platform](https://img.shields.io/badge/platform-linux%20%7C%20osx-blue.svg)]()  [![License](https://img.shields.io/badge/license-apache-yellowgreen.svg)]()
 
 **Native Library** provides low-level optimization and productivity for C/C++ application.
@@ -122,7 +122,7 @@ TEST(YourTestSuite, YourTestCase) {
 - At least one contributor in this project reviews your commits (except you) before merging
 - Best practices guidelines in [CONTRIBUTION.md](https://github.com/foodtiny/native/tree/master/CONTRIBUTION.md)
 
-# Copyright & license
+### Copyright & license
 Copyright © 2014-2016 Food Tiny. All rights reserved, except as follows. Code is released under the Apache 2.0 license.
 You may obtain a duplicate copy of the same license, titled CC-BY-SA-4.0, at http://creativecommons.org/licenses/by/4.0/.
 Terms and conditions set forth in the file [LICENSE.docs](https://github.com/foodtiny/native/tree/master/LICENSE.docs).

java/net/URL/URL.cpp

@@ -43,6 +43,7 @@ URL::URL(String spec) {
 	this->port = number_default(url_port(url));
 	this->query = string_default(http_query(url));
 	this->path = string_default(http_path(url));
+	free(url);
 }
 
 URL::~URL() {}

java/net/URL/URLTest.cpp

@@ -34,25 +34,21 @@ using namespace Java::Net;
 using namespace Java::Lang;
 
 TEST (JavaNet, URLConstructor) {
-#ifdef __APPPLE__
-	return;
-#endif
-
 	String urlString = "http://test.com:3000/file/test?param=1";
 	URL url(urlString);
 	ASSERT_STR("http", url.getProtocol().toString());
 	ASSERT_STR("test.com", url.getHost().toString());
 	ASSERT_EQUAL(3000, url.getPort());
 	ASSERT_STR("/file/test", url.getPath().toString());
 	ASSERT_STR("param=1", url.getQuery().toString());
-
-	urlString = "http://";
-	url = URL(urlString);
-	ASSERT_STR("", url.getProtocol().toString());
-	ASSERT_STR("", url.getHost().toString());
-	ASSERT_STR("", url.getPath().toString());
-	ASSERT_STR("", url.getQuery().toString());
-	ASSERT_EQUAL(-1, url.getPort());
+	
+	String urlString2 = "http://";
+	URL url2(urlString2);
+	ASSERT_STR("", url2.getProtocol().toString());
+	ASSERT_STR("", url2.getHost().toString());
+	ASSERT_STR("", url2.getPath().toString());
+	ASSERT_STR("", url2.getQuery().toString());
+	ASSERT_EQUAL(-1, url2.getPort());
 }
 
 TEST (JavaNet, URLToString) {