Merge branch 'master' of https://github.com/CyC2018/InterviewNotes

2018-05-11 16:27:47 +08:00 · 2018-05-11 16:27:47 +08:00 · 801985368f
commit 801985368f
parent e3ad8f5c88 641325422f
1 changed files with 4 additions and 0 deletions
--- a/notes/剑指
+++ b/notes/剑指
@ -1017,8 +1017,12 @@ public boolean match(char[] str, char[] pattern) {

 ```java
 public boolean isNumeric(char[] str) {
+<<<<<<< HEAD
    if (str == null)
        return false;
+=======
+    if(str.length==0||str==null) return false;
+>>>>>>> 641325422fdf746c627924e530d56949740c0e18
    return new String(str).matches("[+-]?\\d*(\\.\\d+)?([eE][+-]?\\d+)?");
 }
 ```