Skip to content

Commit d0df018

Browse files
author
chenzhuo
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/concurrent/volatilelearn/VolatileOne.java
2 parents 2d83505 + 4c5aac5 commit d0df018

48 files changed

Lines changed: 1061 additions & 59 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/basics/JavaassistTest/FalshClineTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ public void run() {
7777
public final static class VolatileLong {
7878
public volatile long value = 0L;
7979
// public long p1, p2, p3, p4, p5, p6;//屏蔽此行
80-
//public volatileLearn long cvalue =1l;
80+
//public volatilelearn long cvalue =1l;
8181
}
8282
}

‎src/main/java/com/basics/JavaassistTest/FalshClineTestTwo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void run() {
6868
public final static class voli {
6969
public volatile long value = 0L;
7070
public long p1, p2, p3, p4, p5, p6;//屏蔽此行
71-
//public volatileLearn long cvalue =1l;
71+
//public volatilelearn long cvalue =1l;
7272
}
7373
}
7474

‎src/main/java/com/basics/JucTest/LockFree/Job.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void run() {
2323
try {
2424
lock.lock();
2525
System.out.println("this thread :" + Thread.currentThread().getId());
26-
System.out.println("Lock by [" + getName() + "], Waiting by " + ((ReentrantLockTest) lock).getQueue());
26+
System.out.println("lock by [" + getName() + "], Waiting by " + ((ReentrantLockTest) lock).getQueue());
2727
}finally {
2828
lock.unlock();
2929
}

‎src/main/java/com/basics/JucTest/atomic/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*
66
* 原子类
77
*
8-
* cas + volatileLearn
8+
* cas + volatilelearn
99
**/
1010
package com.basics.JucTest.atomic;

‎src/main/java/com/basics/Lock/Synchronized/package-info.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/main/java/com/basics/ThreadCode/AccountingVlog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.basics.ThreadCode;
22

33
/**
4-
* volatileLearn 不安全实例
5-
* volatileLearn 只保证了可见行（内存刷新）
4+
* volatilelearn 不安全实例
5+
* volatilelearn 只保证了可见行（内存刷新）
66
* 并不保证线程安全（原子性）
77
*/
88
public class AccountingVlog implements Runnable {

‎src/main/java/com/basics/atomiclongtest/AtomicLongTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void main(String []args) throws InterruptedException {
2121
Thread oneThread = new Thread(()->{
2222
int size = one.length;
2323
for(int i =0;i<size;i++){
24-
if(one[i].intValue() == 0){
24+
if(one[i] == 0){
2525
atomicLong.incrementAndGet();
2626
}
2727
}

‎src/main/java/com/basics/basecodevalue/CodeMain.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ public static void main(String[] args) {
2222
public static String HloveyRC4(String aInput,String aKey){
2323
int[] iS = new int[256];
2424
byte[] iK = new byte[256];
25-
for (int i=0;i<256;i++)
25+
for (int i=0;i<256;i++) {
2626
iS[i]=i;
27+
}
2728
int j = 1;
2829
for (short i= 0;i<256;i++){
2930
iK[i]=(byte)aKey.charAt((i % aKey.length()));

src/main/java/com/basics/classloadertest/BootstrapClassloaderTest/BootstrapClassloaderTest.java renamed to src/main/java/com/basics/classloadertest/bootstrapclassloadertest/BootstrapClassloaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.basics.classloadertest.BootstrapClassloaderTest;
1+
package com.basics.classloadertest.bootstrapclassloadertest;
22

33
/**
4-
* @ClassName BootstrapClassloaderTest
4+
* @ClassName bootstrapclassloadertest
55
* @Description TODO
66
* @Author chenzhuo
77
* @Date 2018/9/21 15:50

src/main/java/com/basics/classloadertest/classPathTest/ClassLoaderTest.java renamed to src/main/java/com/basics/classloadertest/classpathtest/ClassLoaderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.basics.classloadertest.classPathTest;
1+
package com.basics.classloadertest.classpathtest;
22

33
import java.io.*;
44

55
/**
6-
* PACKAGE_NAME: com.basics.classloadertest.classPathTest
6+
* PACKAGE_NAME: com.basics.classloadertest.classpathtest
77
* MONTH_NAME_SHORT: 九月
88
* USER: Clement
99
**/
@@ -69,7 +69,7 @@ public static void main(String[] args) {
6969
ClassLoaderTest classLoaderTest = new ClassLoaderTest(dir);
7070
try {
7171
Class<?> c
72-
= classLoaderTest.loadClass("com.basics.classloadertest.classPathTest.ObjectHello");
72+
= classLoaderTest.loadClass("com.basics.classloadertest.classpathtest.ObjectHello");
7373
ObjectHello objectHello1 = (ObjectHello) c.newInstance();
7474
if(objectHello1 instanceof ObjectHello ){
7575

0 commit comments

Comments
 (0)