liuyyp
diff --git a/‎src/a01_FactoryMethod/factoryMethod/工厂方法.umr‎
3.96 KB b/‎src/a01_FactoryMethod/factoryMethod/工厂方法.umr‎
3.96 KB
diff --git a/‎src/a01_FactoryMethod/factoryMethod/工厂方法.umr~‎
4 KB b/‎src/a01_FactoryMethod/factoryMethod/工厂方法.umr~‎
4 KB
diff --git a/‎src/a01_FactoryMethod/simpleFactory/Test.java‎
Lines changed: 2 additions & 2 deletions b/‎src/a01_FactoryMethod/simpleFactory/Test.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/a01_FactoryMethod/simpleFactory/简单工厂.umr‎
3.51 KB b/‎src/a01_FactoryMethod/simpleFactory/简单工厂.umr‎
3.51 KB
diff --git a/‎src/a01_FactoryMethod/simpleFactory/简单工厂.umr~‎
3.68 KB b/‎src/a01_FactoryMethod/simpleFactory/简单工厂.umr~‎
3.68 KB
diff --git a/‎src/a03_Singleton/Singleton.java‎
Lines changed: 2 additions & 2 deletions b/‎src/a03_Singleton/Singleton.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/a03_Singleton/Singleton2.java‎
Lines changed: 2 additions & 2 deletions b/‎src/a03_Singleton/Singleton2.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/a03_Singleton/Singleton3.java‎
Lines changed: 11 additions & 5 deletions b/‎src/a03_Singleton/Singleton3.java‎
Lines changed: 11 additions & 5 deletions
diff --git a/‎src/a04_Builder/AudiCar.java‎
Lines changed: 0 additions & 8 deletions b/‎src/a04_Builder/AudiCar.java‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎src/a04_Builder/BydCar.java‎
Lines changed: 0 additions & 9 deletions b/‎src/a04_Builder/BydCar.java‎
Lines changed: 0 additions & 9 deletions
@@ -8,7 +8,7 @@ public class Test {
 
 	public static void main(String[] args) {  
         CarFactory factory = new CarFactory();  
-        Car sender = factory.produce("audi");  
-        sender.run();  
+        Car car = factory.produce("byd");  
+        car.run();
     }
 }
@@ -6,7 +6,7 @@
  */
 public class Singleton {  
 
-    /* 持有私有静态实例，防止被引用，此处赋值为null，目的是实现延迟加载 */  
+    /* 持有私有静态实例，防止被引用*/  
     private static Singleton instance = new Singleton();  
 
     /* 私有构造方法，防止被实例化 */  
@@ -17,5 +17,5 @@ private Singleton() {
     public static Singleton getInstance() {  
         return instance;  
     }
-  
+    
 }  
@@ -15,10 +15,10 @@ private Singleton2() {
 
     /* 静态工程方法，创建实例 */  
     public synchronized static Singleton2 getInstance() {
-    	if (instance == null) {  
+    	if (instance == null) {
     		instance = new Singleton2();  
         }
-        return instance;  
+        return instance;
     }  
 
 }  
@@ -2,7 +2,13 @@
 
 /**
  * 单例模式 - 双重检查
- *
+ *从1.5开始，加了volatile关键字的引用，它的初始化就不能是： 
+	- a. 先分配内存，让instance指向这块内存 
+	- b. 在内存中创建对象
+	
+	而应该是： 
+	- a.在内存中创建对象 
+	- b.让instance指向这个对象.
  */
 public class Singleton3 {  
 
@@ -17,11 +23,11 @@ private Singleton3() {
     public static Singleton3 getInstance() {  
     	//double check
     	if (instance == null) {  
-            synchronized (instance) {  
-                if (instance == null) {  
-                    instance = new Singleton3();  
+            synchronized (Singleton3.class) {  
+                if (instance == null) {
+                    instance = new Singleton3();
                 }  
-            }  
+            }
         } 
         return instance;  
     }
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class Test {`
`8`	`8`
`9`	`9`	`public static void main(String[] args) {`
`10`	`10`	`CarFactory factory = new CarFactory();`
`11`		`- Car sender = factory.produce("audi");`
`12`		`- sender.run();`
	`11`	`+ Car car = factory.produce("byd");`
	`12`	`+ car.run();`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*/`
`7`	`7`	`public class Singleton {`
`8`	`8`
`9`		`- /* 持有私有静态实例，防止被引用，此处赋值为null，目的是实现延迟加载 */`
	`9`	`+ /* 持有私有静态实例，防止被引用*/`
`10`	`10`	`private static Singleton instance = new Singleton();`
`11`	`11`
`12`	`12`	`/* 私有构造方法，防止被实例化 */`
`@@ -17,5 +17,5 @@ private Singleton() {`
`17`	`17`	`public static Singleton getInstance() {`
`18`	`18`	`return instance;`
`19`	`19`	`}`
`20`		`-`
	`20`	`+`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ private Singleton2() {`
`15`	`15`
`16`	`16`	`/* 静态工程方法，创建实例 */`
`17`	`17`	`public synchronized static Singleton2 getInstance() {`
`18`		`- if (instance == null) {`
	`18`	`+ if (instance == null) {`
`19`	`19`	`instance = new Singleton2();`
`20`	`20`	`}`
`21`		`- return instance;`
	`21`	`+ return instance;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`}`